From 8ddbe7bec623e3ab16f654b7aab7a0e74781f73d Mon Sep 17 00:00:00 2001
From: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Date: Tue, 15 Jan 2019 16:08:31 +0100
Subject: [PATCH] sftp: Add NULL check in sftp_ext_free()

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---
 src/sftp.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/sftp.c b/src/sftp.c
index 3726993c..195089bd 100644
--- a/src/sftp.c
+++ b/src/sftp.c
@@ -81,19 +81,26 @@ static sftp_ext sftp_ext_new(void) {
 
 static void sftp_ext_free(sftp_ext ext)
 {
-    unsigned int i;
+    size_t i;
 
     if (ext == NULL) {
         return;
     }
 
-    if (ext->count) {
-        for (i = 0; i < ext->count; i++) {
-            SAFE_FREE(ext->name[i]);
-            SAFE_FREE(ext->data[i]);
+    if (ext->count > 0) {
+        if (ext->name != NULL) {
+            for (i = 0; i < ext->count; i++) {
+                SAFE_FREE(ext->name[i]);
+            }
+            SAFE_FREE(ext->name);
+        }
+
+        if (ext->data != NULL) {
+            for (i = 0; i < ext->count; i++) {
+                SAFE_FREE(ext->data[i]);
+            }
+            SAFE_FREE(ext->data);
         }
-        SAFE_FREE(ext->name);
-        SAFE_FREE(ext->data);
     }
 
     SAFE_FREE(ext);