griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: RNA_property_string_get returns string of incorrect length for id properties

Browse Source 
The returned string was one byte too large, because it contained the null
terminator for string `IDProperty`. Noticed this when retrieving strings
parameters in an operator which are stored as id properties.

Pull Request: https://projects.blender.org/blender/blender/pulls/141321
This commit is contained in:
Jacques Lucke
2025-07-02 16:41:39 +02:00
parent b4ca7b5022
commit fd377916c6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3734,17 +3734,18 @@ std::string RNA_property_string_get(PointerRNA *ptr, PropertyRNA *prop)
IDProperty *idprop;
BLI_assert(RNA_property_type(prop) == PROP_STRING);
const size_t length = size_t(RNA_property_string_length(ptr, prop));
if ((idprop = rna_idproperty_check(&prop, ptr))) {
/* NOTE: `std::string` does support NULL char in its data. */
return std::string{IDP_String(idprop), size_t(idprop->len)};
/* For normal strings, the length does not contain the null terminator. But for
* #IDP_STRING_SUB_BYTE, it contains the full string including any terminating null. */
return std::string{IDP_String(idprop), length};
}
if (!sprop->get && !sprop->get_ex) {
return std::string{sprop->defaultvalue};
}
size_t length = size_t(RNA_property_string_length(ptr, prop));
std::string string_ret{};
/* Note: after `resize()` the underlying buffer is actually at least `length +
* 1` bytes long, because (since C++11) `std::string` guarantees a terminating