griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

=== OpenEXR ===

Browse Source 
* fix [ #6105 ] Blender crashes when opening multilayer with node in compositor
  - Mem_IStream membuf was allocated on the stack, so it caused major troubles when
 out of the function scope. Now allocate it on the heap and let OpenEXR deal with
 freeing it.
  - moved + added delete file;'s for completeness
This commit is contained in:
Nathan Letwory
2007-03-27 10:13:57 +00:00
parent 12c8ce44ca
commit e3ff98fc6b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/imbuf/intern/openexr/openexr_api.cpp
View File

@@ -873,9 +873,9 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags)
try
{
Mem_IStream membuf(mem, size);
Mem_IStream *membuf = new Mem_IStream(mem, size);
int is_multi;
file = new InputFile(membuf);
file = new InputFile(*membuf);
Box2i dw = file->header().dataWindow();
int width = dw.max.x - dw.min.x + 1;
@@ -946,8 +946,8 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags)
}
}
delete file;
}
delete file;
return(ibuf);
@@ -956,6 +956,7 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags)
{
std::cerr << exc.what() << std::endl;
if (ibuf) IMB_freeImBuf(ibuf);
delete file;
return (0);
}