diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-20 23:31:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-21 00:46:58 +0300 |
| commit | a4cd7b7297ad1474c8adf9d5c6aeb52f2397a572 (patch) | |
| tree | 606c7ccf7ade71abf4cafc8c590df736db17456d /intern/cycles | |
| parent | 3b12a71972c35ea80d4dff367b737107ee08b986 (diff) | |
Fix potential memory leak in Cycles loading of packed/generated images.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 2b5dd5eadea..753b3822cab 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -1115,7 +1115,6 @@ bool BlenderSession::builtin_image_pixels(const string &builtin_name, if(image_pixels && num_pixels * channels == pixels_size) { memcpy(pixels, image_pixels, pixels_size * sizeof(unsigned char)); - MEM_freeN(image_pixels); } else { if(channels == 1) { @@ -1134,6 +1133,11 @@ bool BlenderSession::builtin_image_pixels(const string &builtin_name, } } } + + if(image_pixels) { + MEM_freeN(image_pixels); + } + /* Premultiply, byte images are always straight for Blender. */ unsigned char *cp = pixels; for(size_t i = 0; i < num_pixels; i++, cp += channels) { @@ -1172,7 +1176,6 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, if(image_pixels && num_pixels * channels == pixels_size) { memcpy(pixels, image_pixels, pixels_size * sizeof(float)); - MEM_freeN(image_pixels); } else { if(channels == 1) { @@ -1192,6 +1195,10 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name, } } + if(image_pixels) { + MEM_freeN(image_pixels); + } + return true; } else if(b_id.is_a(&RNA_Object)) { |