blender
/
blender
135
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Fix: segfault when indexing into some collections with strings. #107086

Merged
Nathan Vegdahl merged 1 commits from nathanvegdahl/blender:str_collection_indexing_bug into main 2023-04-18 17:15:34 +02:00
Conversation 0 Commits 1 Files Changed 1 +7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/python/intern/bpy_rna.c
View File

@ -2371,6 +2371,13 @@ static PyObject *pyrna_prop_collection_subscript_str(BPy_PropertyRNA *self, cons
RNA_property_collection_begin(&self->ptr, self->prop, &iter);
for (int i = 0; iter.valid; RNA_property_collection_next(&iter), i++) {
PropertyRNA *nameprop = RNA_struct_name_property(iter.ptr.type);
BLI_assert_msg(
nameprop,
"Attempted to use a string to index into a collection of items with no 'nameproperty'.");
if (nameprop == NULL) {
// For non-debug builds, bail if there's no 'nameproperty' to check.
Hans Goudey commented 2023-04-18 17:06:38 +02:00
Review
Copy Link

Blender uses /* */ comment style, see https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Comments

Blender uses `/* */` comment style, see https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Comments
Nathan Vegdahl commented 2023-04-18 17:17:23 +02:00
Review
Copy Link

Gah! Sorry, I didn't refresh the page between Bastien's approval and merging, and missed your comment. Thanks for letting me know. I'll fix it.

Gah! Sorry, I didn't refresh the page between Bastien's approval and merging, and missed your comment. Thanks for letting me know. I'll fix it.
break;
}
char *nameptr = RNA_property_string_get_alloc(
&iter.ptr, nameprop, name, sizeof(name), &namelen);
if ((keylen == namelen) && STREQ(nameptr, keyname)) {