From 0187b719129269070ab53e50a3ba311c4f459ff0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 28 Oct 2019 14:28:32 +0100
Subject: [PATCH] SSH-01-006: Add missing NULL checks in ssh_scp_push_file64()

Fixes T193

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit fff4120cbfffb7520cca94a75ada533b5b08bfc8)
---
 src/scp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/scp.c b/src/scp.c
index 652551e3..c94d5c09 100644
--- a/src/scp.c
+++ b/src/scp.c
@@ -428,7 +428,16 @@ int ssh_scp_push_file64(ssh_scp scp, const char *filename, uint64_t size,
     }
 
     file = ssh_basename(filename);
+    if (file == NULL) {
+        ssh_set_error_oom(scp->session);
+        return SSH_ERROR;
+    }
     perms = ssh_scp_string_mode(mode);
+    if (perms == NULL) {
+        SAFE_FREE(file);
+        ssh_set_error_oom(scp->session);
+        return SSH_ERROR;
+    }
     SSH_LOG(SSH_LOG_PROTOCOL,
             "SCP pushing file %s, size %" PRIu64 " with permissions '%s'",
             file, size, perms);