[Bf-blender-cvs] [4be7fb7] master: ImBuf: Fix OpenExr leaking memory when reading file with IB_test flag

Sergey Sharybin noreply at git.blender.org
Thu Jul 23 09:14:14 CEST 2015


Commit: 4be7fb7651418240347b78dd5874a3bb6f84d73c
Author: Sergey Sharybin
Date:   Thu Jul 23 09:10:11 2015 +0200
Branches: master
https://developer.blender.org/rB4be7fb7651418240347b78dd5874a3bb6f84d73c

ImBuf: Fix OpenExr leaking memory when reading file with IB_test flag

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

M	source/blender/imbuf/intern/openexr/openexr_api.cpp

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

diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index cd9701c..33555f0 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -2048,15 +2048,13 @@ struct ImBuf *imb_load_openexr(const unsigned char *mem, size_t size, int flags,
 						}
 					}
 
-					/* file is no longer needed */
-					delete membuf;
-					delete file;
 				}
 			}
-
 			if (flags & IB_alphamode_detect)
 				ibuf->flags |= IB_alphamode_premul;
 		}
+		delete file;
+		delete membuf;
 		return(ibuf);
 	}
 	catch (const std::exception& exc)




More information about the Bf-blender-cvs mailing list