[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11651] branches/soc-2007-joeedh/source/ blender/render/intern/source: crasher update.

Joseph Eagar joeedh at gmail.com
Sat Aug 18 07:03:18 CEST 2007


Revision: 11651
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11651
Author:   joeedh
Date:     2007-08-18 07:03:18 +0200 (Sat, 18 Aug 2007)

Log Message:
-----------
crasher update.  fixed a crasher issue.

Modified Paths:
--------------
    branches/soc-2007-joeedh/source/blender/render/intern/source/shadbuf.c
    branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c

Modified: branches/soc-2007-joeedh/source/blender/render/intern/source/shadbuf.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/render/intern/source/shadbuf.c	2007-08-18 04:42:53 UTC (rev 11650)
+++ branches/soc-2007-joeedh/source/blender/render/intern/source/shadbuf.c	2007-08-18 05:03:18 UTC (rev 11651)
@@ -650,6 +650,8 @@
 	tilex = xs/buf->tsizex;
 	tiley = ys/buf->tsizey;
 
+	if (tilex >= buf->tilex || tiley >= buf->tiley || tilex < 0 || tiley < 0) return 1.0;
+
 	//tile = TCS_GetTile((TCS_TileBuffer*)buf, tilex, tiley, 0); //&buf->vfunc_rect[tiley*buf->tilex+tilex];
 	tile = &buf->vfunc_rect[tiley*buf->tilex+tilex];
 

Modified: branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c	2007-08-18 04:42:53 UTC (rev 11650)
+++ branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c	2007-08-18 05:03:18 UTC (rev 11651)
@@ -3775,7 +3775,7 @@
 	rdrect= pa.rectdaps;
 
 	mergescratchlen = sizeof(_ClrEntry) > sizeof(DSMLayerSample) ? sizeof(_ClrEntry)*dbuf->max_depth : sizeof(DSMLayerSample)*dbuf->max_depth;
-	mergescratch = row = MEM_mapallocN(mergescratchlen, "mergescratch in zbuf.c");
+	mergescratch = (char*) row = MEM_mapallocN(mergescratchlen, "mergescratch in zbuf.c");
 
 	/* render the tile */
 	for(y=0; y<pa.recty; y++) {





More information about the Bf-blender-cvs mailing list