[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25560] trunk/blender/source/blender/ makesrna/intern/rna_access.c: invalid memory access fix
Campbell Barton
ideasman42 at gmail.com
Sat Dec 26 00:59:13 CET 2009
Revision: 25560
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25560
Author: campbellbarton
Date: 2009-12-26 00:59:12 +0100 (Sat, 26 Dec 2009)
Log Message:
-----------
invalid memory access fix
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_access.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-12-25 23:51:29 UTC (rev 25559)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2009-12-25 23:59:12 UTC (rev 25560)
@@ -946,7 +946,7 @@
int RNA_property_enum_value(bContext *C, PointerRNA *ptr, PropertyRNA *prop, const char *identifier, int *value)
{
EnumPropertyItem *item, *item_array;
- int free;
+ int free, found;
RNA_property_enum_items(C, ptr, prop, &item_array, NULL, &free);
@@ -956,11 +956,13 @@
break;
}
}
+
+ found= (item->identifier != NULL); /* could be alloc'd, assign before free */
if(free)
MEM_freeN(item_array);
- return (item->identifier) ? 1:0;
+ return found;
}
int RNA_enum_identifier(EnumPropertyItem *item, const int value, const char **identifier)
More information about the Bf-blender-cvs
mailing list