blender/blender
148
473
Fork 695
Code Issues 6.7k Pull Requests 900 Projects 18 Wiki Activity

Fix #109024: Off-by-1 in rna_access for non-array props without raw access #115967

Open
Thomas Barlow wants to merge 4 commits from Mysteryem/blender:fix_109024_non_raw_non_array_off_by_one into main
pull from: Mysteryem/blender:fix_109024_non_raw_non_array_off_by_one
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 4 Files Changed 1 +7 -6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed25adc3db - Show all commits

13
source/blender/makesrna/intern/rna_access.cc
View File

@ -4551,7 +4551,7 @@ static int rna_raw_access(ReportList *reports,
PropertyRNA *itemprop, *iprop;
PropertyType itemtype = PropertyType(0);
RawArray in;
int itemlen = 0;
int itemlen = 0, arraylen = 0;
/* initialize in array, stride assumed 0 in following code */
in.array = inarray;
@ -4578,7 +4578,8 @@ static int rna_raw_access(ReportList *reports,
}
/* check item array */
itemlen = RNA_property_array_length(&itemptr_base, itemprop);
arraylen = RNA_property_array_length(&itemptr_base, itemprop);
itemlen = (arraylen == 0) ? 1 : arraylen;
/* dynamic array? need to get length per item */
if (itemprop->getlength) {
@ -4586,8 +4587,7 @@ static int rna_raw_access(ReportList *reports,
}
/* try to access as raw array */
else if (RNA_property_collection_raw_array(ptr, prop, itemprop, set, &out)) {
int arraylen = (itemlen == 0) ? 1 : itemlen;
if (in.len != arraylen * out.len) {
if (in.len != itemlen * out.len) {
BKE_reportf(reports,
RPT_ERROR,
"Array length mismatch (expected %d, got %d)",
@ -4650,7 +4650,8 @@ static int rna_raw_access(ReportList *reports,
iprop = RNA_struct_find_property(&itemptr, propname);
if (iprop) {
itemlen = rna_property_array_length_all_dimensions(&itemptr, iprop);
arraylen = rna_property_array_length_all_dimensions(&itemptr, iprop);
itemlen = (arraylen == 0) ? 1 : arraylen;
itemtype = RNA_property_type(iprop);
}
else {
@ -4675,7 +4676,7 @@ static int rna_raw_access(ReportList *reports,
break;
}
if (itemlen == 0) {
if (arraylen == 0) {
/* handle conversions */
if (set) {
switch (itemtype) {