[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39959] trunk/blender/source/blender: fix for error in strinc.c's BLI_strescape

[Campbell Barton]

Revision: 39959
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39959
Author:   campbellbarton
Date:     2011-09-06 07:08:20 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
fix for error in strinc.c's BLI_strescape

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/string.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c

Modified: trunk/blender/source/blender/blenlib/intern/string.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string.c        2011-09-06 
05:18:02 UTC (rev 39958)
+++ trunk/blender/source/blender/blenlib/intern/string.c        2011-09-06 
07:08:20 UTC (rev 39959)
@@ -129,7 +129,7 @@
        while(len < maxlen) {
                switch(*src) {
                        case '\0':
-                               break;
+                               goto escape_finish;
                        case '\\':
                        case '"':
 
@@ -154,6 +154,8 @@
                len++;
        }
 
+escape_finish:
+
        *dst= '\0';
 
        return len;

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c   2011-09-06 
05:18:02 UTC (rev 39958)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c   2011-09-06 
07:08:20 UTC (rev 39959)
@@ -4407,7 +4407,7 @@
                buf= MEM_mallocN(sizeof(char)*(length+1), 
"RNA_property_as_string");
                buf_esc= MEM_mallocN(sizeof(char)*(length*2+1), 
"RNA_property_as_string esc");
                RNA_property_string_get(ptr, prop, buf);
-               BLI_strescape(buf_esc, buf, length*2);
+               BLI_strescape(buf_esc, buf, length*2+1);
                MEM_freeN(buf);
                BLI_dynstr_appendf(dynstr, "\"%s\"", buf_esc);
                MEM_freeN(buf_esc);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs