[Xfce4-commits] [xfce/tumbler] 01/01: Fix setting internal error to NULL in pixbuf thumbnailer (bug #10878)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

jannis pushed a commit to branch master
in repository xfce/tumbler.

commit dc74b5d38009a5f6c1064f69d8b7d632ae0b52a5
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Fri Jul 25 13:58:32 2014 +0200

    Fix setting internal error to NULL in pixbuf thumbnailer (bug #10878)
---
 plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
index 9c64659..1196654 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
@@ -164,7 +164,8 @@ pixbuf_thumbnailer_new_from_stream (GInputStream      *stream,
       if (n_read < 0)
         {
           result = FALSE;
-          error = NULL;
+          if (error != NULL)
+            *error = NULL;
           break;
         }
 
@@ -174,7 +175,8 @@ pixbuf_thumbnailer_new_from_stream (GInputStream      *stream,
       if (!gdk_pixbuf_loader_write (loader, buffer, n_read, error))
         {
           result = FALSE;
-          error = NULL;
+          if (error != NULL)
+            *error = NULL;
           break;
         }
     }
@@ -182,7 +184,8 @@ pixbuf_thumbnailer_new_from_stream (GInputStream      *stream,
   if (!gdk_pixbuf_loader_close (loader, error))
     {
       result = FALSE;
-      error = NULL;
+      if (error != NULL)
+        *error = NULL;
     }
 
   if (result)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.