Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/blenkernel/intern/idprop.c5
-rw-r--r--source/blender/makesrna/intern/rna_access.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 0596c5109dd..603ddf7ac2e 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -334,13 +334,12 @@ IDProperty *IDP_NewString(const char *st, const char *name, int maxlen)
prop->len = 1; /* NULL string, has len of 1 to account for null byte. */
}
else {
- int stlen = strlen(st);
+ /* include null terminator '\0' */
+ int stlen = strlen(st) + 1;
if (maxlen > 0 && maxlen < stlen)
stlen = maxlen;
- stlen++; /* null terminator '\0' */
-
prop->data.pointer = MEM_mallocN(stlen, "id property string 2");
prop->len = prop->totallen = stlen;
BLI_strncpy(prop->data.pointer, st, stlen);
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 7946d24b83b..a3dee924c0b 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -2594,7 +2594,7 @@ void RNA_property_string_set(PointerRNA *ptr, PropertyRNA *prop, const char *val
group = RNA_struct_idprops(ptr, 1);
if (group)
- IDP_AddToGroup(group, IDP_NewString(value, prop->identifier, RNA_property_string_maxlength(prop) - 1));
+ IDP_AddToGroup(group, IDP_NewString(value, prop->identifier, RNA_property_string_maxlength(prop)));
}
}