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:
authorCampbell Barton <ideasman42@gmail.com>2014-02-15 05:31:58 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-15 05:31:58 +0400
commit77a15aba38f00cd2694bb7c463057cada0690e50 (patch)
treef87b867a1c0c334fa44a74615c9e749ceb3974a6 /source/blender/blenkernel/intern/idprop.c
parent15969fba1f151a370dd2a74d9fa811704ab0eb53 (diff)
IDProp API: change IDP_NewString so `sizeof()` can be passed in.
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
-rw-r--r--source/blender/blenkernel/intern/idprop.c5
1 files changed, 2 insertions, 3 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);