This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit e478e311d2b938d7e02bded5ee021e3774fb5d1d
Author: Donny <m4n4t4...@gmail.com>
Date:   Tue Oct 20 07:54:36 2015 -0400

    All: Fix crash from reading past end of tr.refdef.drawSurfs
---
 MP/code/rend2/tr_main.c    | 18 ++++++++++--------
 MP/code/renderer/tr_main.c | 18 ++++++++++--------
 SP/code/rend2/tr_main.c    | 18 ++++++++++--------
 SP/code/renderer/tr_main.c | 18 ++++++++++--------
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/MP/code/rend2/tr_main.c b/MP/code/rend2/tr_main.c
index 88e6848..f7601e6 100644
--- a/MP/code/rend2/tr_main.c
+++ b/MP/code/rend2/tr_main.c
@@ -2078,13 +2078,6 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
                return;
        }
 
-       // if we overflowed MAX_DRAWSURFS, the drawsurfs
-       // wrapped around in the buffer and we will be missing
-       // the first surfaces, not the last ones
-       if ( numDrawSurfs > MAX_DRAWSURFS ) {
-               numDrawSurfs = MAX_DRAWSURFS;
-       }
-
        // sort the drawsurfs by sort type, then orientation, then shader
        R_RadixSort( drawSurfs, numDrawSurfs );
 
@@ -2322,6 +2315,7 @@ or a mirror / remote location
 */
 void R_RenderView( viewParms_t *parms ) {
        int firstDrawSurf;
+       int numDrawSurfs;
 
        if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
                return;
@@ -2344,7 +2338,15 @@ void R_RenderView( viewParms_t *parms ) {
 
        R_GenerateDrawSurfs();
 
-       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, 
tr.refdef.numDrawSurfs - firstDrawSurf );
+       // if we overflowed MAX_DRAWSURFS, the drawsurfs
+       // wrapped around in the buffer and we will be missing
+       // the first surfaces, not the last ones
+       numDrawSurfs = tr.refdef.numDrawSurfs;
+       if ( numDrawSurfs > MAX_DRAWSURFS ) {
+               numDrawSurfs = MAX_DRAWSURFS;
+       }
+
+       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - 
firstDrawSurf );
 
        // draw main system development information (surface outlines, etc)
        R_FogOff();
diff --git a/MP/code/renderer/tr_main.c b/MP/code/renderer/tr_main.c
index fc36e72..13e512e 100644
--- a/MP/code/renderer/tr_main.c
+++ b/MP/code/renderer/tr_main.c
@@ -1431,13 +1431,6 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
                return;
        }
 
-       // if we overflowed MAX_DRAWSURFS, the drawsurfs
-       // wrapped around in the buffer and we will be missing
-       // the first surfaces, not the last ones
-       if ( numDrawSurfs > MAX_DRAWSURFS ) {
-               numDrawSurfs = MAX_DRAWSURFS;
-       }
-
        // sort the drawsurfs by sort type, then orientation, then shader
        R_RadixSort( drawSurfs, numDrawSurfs );
 
@@ -1674,6 +1667,7 @@ or a mirror / remote location
 */
 void R_RenderView( viewParms_t *parms ) {
        int firstDrawSurf;
+       int numDrawSurfs;
 
        if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
                return;
@@ -1696,7 +1690,15 @@ void R_RenderView( viewParms_t *parms ) {
 
        R_GenerateDrawSurfs();
 
-       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, 
tr.refdef.numDrawSurfs - firstDrawSurf );
+       // if we overflowed MAX_DRAWSURFS, the drawsurfs
+       // wrapped around in the buffer and we will be missing
+       // the first surfaces, not the last ones
+       numDrawSurfs = tr.refdef.numDrawSurfs;
+       if ( numDrawSurfs > MAX_DRAWSURFS ) {
+               numDrawSurfs = MAX_DRAWSURFS;
+       }
+
+       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - 
firstDrawSurf );
 
        // draw main system development information (surface outlines, etc)
        R_FogOff();
diff --git a/SP/code/rend2/tr_main.c b/SP/code/rend2/tr_main.c
index 83c9f02..d5981a3 100644
--- a/SP/code/rend2/tr_main.c
+++ b/SP/code/rend2/tr_main.c
@@ -2125,13 +2125,6 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
                return;
        }
 
-       // if we overflowed MAX_DRAWSURFS, the drawsurfs
-       // wrapped around in the buffer and we will be missing
-       // the first surfaces, not the last ones
-       if ( numDrawSurfs > MAX_DRAWSURFS ) {
-               numDrawSurfs = MAX_DRAWSURFS;
-       }
-
        // sort the drawsurfs by sort type, then orientation, then shader
        R_RadixSort( drawSurfs, numDrawSurfs );
 
@@ -2371,6 +2364,7 @@ or a mirror / remote location
 */
 void R_RenderView( viewParms_t *parms ) {
        int firstDrawSurf;
+       int numDrawSurfs;
 
        if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
                return;
@@ -2393,7 +2387,15 @@ void R_RenderView( viewParms_t *parms ) {
 
        R_GenerateDrawSurfs();
 
-       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, 
tr.refdef.numDrawSurfs - firstDrawSurf );
+       // if we overflowed MAX_DRAWSURFS, the drawsurfs
+       // wrapped around in the buffer and we will be missing
+       // the first surfaces, not the last ones
+       numDrawSurfs = tr.refdef.numDrawSurfs;
+       if ( numDrawSurfs > MAX_DRAWSURFS ) {
+               numDrawSurfs = MAX_DRAWSURFS;
+       }
+
+       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - 
firstDrawSurf );
 
        // draw main system development information (surface outlines, etc)
        R_FogOff();
diff --git a/SP/code/renderer/tr_main.c b/SP/code/renderer/tr_main.c
index 34036c0..7495670 100644
--- a/SP/code/renderer/tr_main.c
+++ b/SP/code/renderer/tr_main.c
@@ -1489,13 +1489,6 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int 
numDrawSurfs ) {
                return;
        }
 
-       // if we overflowed MAX_DRAWSURFS, the drawsurfs
-       // wrapped around in the buffer and we will be missing
-       // the first surfaces, not the last ones
-       if ( numDrawSurfs > MAX_DRAWSURFS ) {
-               numDrawSurfs = MAX_DRAWSURFS;
-       }
-
        // sort the drawsurfs by sort type, then orientation, then shader
        R_RadixSort( drawSurfs, numDrawSurfs );
 
@@ -1735,6 +1728,7 @@ or a mirror / remote location
 */
 void R_RenderView( viewParms_t *parms ) {
        int firstDrawSurf;
+       int numDrawSurfs;
 
        if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
                return;
@@ -1757,7 +1751,15 @@ void R_RenderView( viewParms_t *parms ) {
 
        R_GenerateDrawSurfs();
 
-       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, 
tr.refdef.numDrawSurfs - firstDrawSurf );
+       // if we overflowed MAX_DRAWSURFS, the drawsurfs
+       // wrapped around in the buffer and we will be missing
+       // the first surfaces, not the last ones
+       numDrawSurfs = tr.refdef.numDrawSurfs;
+       if ( numDrawSurfs > MAX_DRAWSURFS ) {
+               numDrawSurfs = MAX_DRAWSURFS;
+       }
+
+       R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - 
firstDrawSurf );
 
        // draw main system development information (surface outlines, etc)
        R_FogOff();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/iortcw.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to