[Bf-blender-cvs] [20d6b79] master: Fix T41767: Memory free problem when console area copy fail.

[Bastien Montagne]

Commit: 20d6b792a49fe0693e6ebfb05bbec3ce4d2b3930
Author: Bastien Montagne
Date:   Wed Sep 10 13:14:29 2014 +0200
Branches: master
https://developer.blender.org/rB20d6b792a49fe0693e6ebfb05bbec3ce4d2b3930

Fix T41767: Memory free problem when console area copy fail.

Nice little memleak!

Patch by reporter (randon (Dun Liang)) with minor own cleanup, thanks!

===================================================================

M       source/blender/editors/space_console/console_ops.c

===================================================================

diff --git a/source/blender/editors/space_console/console_ops.c 
b/source/blender/editors/space_console/console_ops.c
index b8743d6..b44e942 100644
--- a/source/blender/editors/space_console/console_ops.c
+++ b/source/blender/editors/space_console/console_ops.c
@@ -888,7 +888,7 @@ static int console_copy_exec(bContext *C, wmOperator 
*UNUSED(op))
 {
        SpaceConsole *sc = CTX_wm_space_console(C);
 
-       DynStr *buf_dyn = BLI_dynstr_new();
+       DynStr *buf_dyn;
        char *buf_str;
        
        ConsoleLine *cl;
@@ -897,14 +897,6 @@ static int console_copy_exec(bContext *C, wmOperator 
*UNUSED(op))
 
        ConsoleLine cl_dummy = {NULL};
 
-#if 0
-       /* copy whole file */
-       for (cl = sc->scrollback.first; cl; cl = cl->next) {
-               BLI_dynstr_append(buf_dyn, cl->line);
-               BLI_dynstr_append(buf_dyn, "\n");
-       }
-#endif
-
        if (sc->sel_start == sc->sel_end)
                return OPERATOR_CANCELLED;
 
@@ -919,6 +911,7 @@ static int console_copy_exec(bContext *C, wmOperator 
*UNUSED(op))
                return OPERATOR_CANCELLED;
        }
 
+       buf_dyn = BLI_dynstr_new();
        offset -= 1;
        sel[0] = offset - sc->sel_end;
        sel[1] = offset - sc->sel_start;

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