From d58024ecec3d5b374389886427fed7f8e1e2bfa0 Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Sun, 31 Oct 2010 18:12:18 +0100
Subject: [PATCH] Check that buffer pointer is not NULL in
 upgrade_file_read_buffer

---
 src/core/wee-upgrade-file.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/core/wee-upgrade-file.c b/src/core/wee-upgrade-file.c
index 9fd024002..fa34f5225 100644
--- a/src/core/wee-upgrade-file.c
+++ b/src/core/wee-upgrade-file.c
@@ -479,7 +479,10 @@ int
 upgrade_file_read_buffer (struct t_upgrade_file *upgrade_file,
                           void **buffer, int *size)
 {
-    if (buffer && *buffer)
+    if (!buffer)
+        return 0;
+    
+    if (*buffer)
     {
         free (*buffer);
         *buffer = NULL;
@@ -495,7 +498,7 @@ upgrade_file_read_buffer (struct t_upgrade_file *upgrade_file,
         
         *buffer = malloc (*size);
         
-        if (buffer && *buffer)
+        if (*buffer)
         {
             if (fread (*buffer, *size, 1, upgrade_file->file) <= 0)
                 return 0;