ImageViewer: Fix FS#13329 (GIF File handle/memory leaks)

Change-Id: Ib3ef22716c8ba35c7bb78231ca4f5c7155f16018

1 files changed, 7 insertions, 5 deletions

diff --git a/apps/plugins/imageviewer/gif/gif.c b/apps/plugins/imageviewer/gif/gif.c
index b78709556d..0521c29e3a 100644
--- a/apps/plugins/imageviewer/gif/gif.c
+++ b/apps/plugins/imageviewer/gif/gif.c
@@ -132,6 +132,8 @@ static int load_image(char *filename, struct image_info *info,
             time = *rb->current_tick - time;
         }
 
+    gif_decoder_destroy_memory_pool(p_decoder);
+
     if (!iv->running_slideshow && !p_decoder->error)
     {
         rb->snprintf(print, sizeof(print), " %ld.%02ld sec ", time/HZ, time%HZ);
@@ -142,6 +144,9 @@ static int load_image(char *filename, struct image_info *info,
 
     if (p_decoder->error)
     {
+        if (p_decoder->error == D_GIF_ERR_NOT_ENOUGH_MEM)
+            return PLUGIN_OUTOFMEM;
+
         rb->splashf(HZ, "%s", GifErrorString(p_decoder->error));
         return PLUGIN_ERROR;
     }
@@ -157,12 +162,9 @@ static int load_image(char *filename, struct image_info *info,
     img_size = (p_decoder->native_img_size*p_decoder->frames_count + 3) & ~3;
     disp_size = (sizeof(unsigned char *)*p_decoder->frames_count*4 + 3) & ~3;
 
+    /* No memory to allocate disp matrix */
     if (memory_size < img_size + disp_size)
-    {
-        /* No memory to allocate disp matrix */
-        rb->splashf(HZ, "%s", GifErrorString(D_GIF_ERR_NOT_ENOUGH_MEM));
-        return PLUGIN_ERROR;
-    }
+        return PLUGIN_OUTOFMEM;
 
     disp = (unsigned char **)(p_decoder->mem + img_size);
     disp_buf = (unsigned char *)disp + disp_size;