[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23095] branches/blender2.5/blender/source /blender/editors: - off by 1 error with console command line memory re-allocation.

[Campbell Barton]

Revision: 23095
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23095
Author:   campbellbarton
Date:     2009-09-10 01:11:43 +0200 (Thu, 10 Sep 2009)

Log Message:
-----------
- off by 1 error with console command line memory re-allocation.
- documenting vgroups crashed.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
    
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c

Modified: 
branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c   
2009-09-09 20:56:49 UTC (rev 23094)
+++ branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c   
2009-09-09 23:11:43 UTC (rev 23095)
@@ -1230,13 +1230,13 @@
 
 static EnumPropertyItem *vgroup_itemf(bContext *C, PointerRNA *ptr, int *free)
 {      
-       Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+       Object *ob;
        EnumPropertyItem tmp = {0, "", 0, "", ""};
        EnumPropertyItem *item= NULL;
        bDeformGroup *def;
        int a, totitem= 0;
        
-       if(!C) /* needed for docs */
+       if(!C || !(ob = CTX_data_pointer_get_type(C, "object", 
&RNA_Object).data)) /* needed for docs */
                return vgroup_items;
        
        for(a=0, def=ob->defbase.first; def; def=def->next, a++) {

Modified: 
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c  
    2009-09-09 20:56:49 UTC (rev 23094)
+++ 
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c  
    2009-09-09 23:11:43 UTC (rev 23095)
@@ -190,7 +190,7 @@
 static void console_line_verify_length(ConsoleLine *ci, int len)
 {
        /* resize the buffer if needed */
-       if(len > ci->len_alloc) {
+       if(len >= ci->len_alloc) {
                int new_len= len * 2; /* new length */
                char *new_line= MEM_callocN(new_len, "console line");
                memcpy(new_line, ci->line, ci->len);


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