[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44997] trunk/blender/source/blender/ blenlib/intern/rand.c: fix for error reported on IRC, sorting zero sized lists would cause a crash.

Campbell Barton ideasman42 at gmail.com
Mon Mar 19 20:27:39 CET 2012


Revision: 44997
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44997
Author:   campbellbarton
Date:     2012-03-19 19:27:39 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
fix for error reported on IRC, sorting zero sized lists would cause a crash.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/rand.c

Modified: trunk/blender/source/blender/blenlib/intern/rand.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/rand.c	2012-03-19 19:17:17 UTC (rev 44996)
+++ trunk/blender/source/blender/blenlib/intern/rand.c	2012-03-19 19:27:39 UTC (rev 44997)
@@ -111,8 +111,14 @@
 void rng_shuffleArray(RNG *rng, void *data, int elemSize, int numElems)
 {
 	int i = numElems;
-	void *temp = malloc(elemSize);
+	void *temp;
 
+	if (numElems <= 0) {
+		return;
+	}
+
+	temp = malloc(elemSize);
+
 	while (--i) {
 		int j = rng_getInt(rng)%numElems;
 		if(i!=j) {




More information about the Bf-blender-cvs mailing list