[Bf-blender-cvs] [0be4308] soc-2013-paint: Fix issues reported by gcc address sanitizer

Antony Riakiotakis noreply at git.blender.org
Sat May 10 17:50:30 CEST 2014


Commit: 0be430801354a76bb1116222ca9aa2c9a83b4e33
Author: Antony Riakiotakis
Date:   Sat May 10 18:50:22 2014 +0300
https://developer.blender.org/rB0be430801354a76bb1116222ca9aa2c9a83b4e33

Fix issues reported by gcc address sanitizer

* paint curves and palettes should be freed after brushes
* out of bounds write in transform code.

===================================================================

M	source/blender/blenkernel/intern/library.c
M	source/blender/editors/transform/transform.c

===================================================================

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 858b7d1..187aeb8 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -600,6 +600,8 @@ int set_listbasepointers(Main *main, ListBase **lb)
 	lb[a++] = &(main->text);
 	lb[a++] = &(main->sound);
 	lb[a++] = &(main->group);
+	lb[a++] = &(main->palettes);
+	lb[a++] = &(main->paintcurves);
 	lb[a++] = &(main->brush);
 	lb[a++] = &(main->script);
 	lb[a++] = &(main->particle);
@@ -614,8 +616,6 @@ int set_listbasepointers(Main *main, ListBase **lb)
 	lb[a++] = &(main->wm);
 	lb[a++] = &(main->movieclip);
 	lb[a++] = &(main->mask);
-	lb[a++] = &(main->palettes);
-	lb[a++] = &(main->paintcurves);
 	
 	lb[a] = NULL;
 
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index e6fa291..b8ad86c 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -368,7 +368,6 @@ void projectIntViewEx(TransInfo *t, const float vec[3], int adr[2], const eV3DPr
 		else if (t->options & CTX_PAINT_CURVE){
 			adr[0] = vec[0];
 			adr[1] = vec[1];
-			adr[2] = 0.0;
 		}
 		else {
 			float aspx, aspy, v[2];




More information about the Bf-blender-cvs mailing list