diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-02-16 19:35:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-16 19:35:47 +0300 |
| commit | b7af3d2cbd8dc39e1d133f9c7251cb70cf1aa75b (patch) | |
| tree | 005fbfa62faf9a152c7975c1f52ac2cd662ee5f1 /intern | |
| parent | 97a28c52b488f8385598d67be9b7e8a1eee66b26 (diff) | |
fix for [#8257] double-freeing pointers from sculpt code
http://projects.blender.org/tracker/index.php?func=detail&aid=8257&group_id=9&atid=125
Cleaned up scene_copy, and moved some scene copying into this function that was inline in the user interface.
Also moved malloc error prints onto separate lines so you can set breakpoints.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index c1ddfa71a10..20d3a5b07fc 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -529,8 +529,10 @@ short MEM_freeN(void *vmemh) /* anders compileertie niet meer */ } else{ error = -1; name = check_memlist(memh); - if (name == 0) MemorY_ErroR("free","pointer not in memlist"); - else MemorY_ErroR(name,"error in header"); + if (name == 0) + MemorY_ErroR("free","pointer not in memlist"); + else + MemorY_ErroR(name,"error in header"); } totblock--; |