From 53e14bd3c9c81aafe0a413216d4d186ee5dbe091 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Tue, 7 Aug 2018 18:42:15 -0600
Subject: [PATCH] fix for uninitialized value and for base directory on nucleus
 port

---
 src/wolfscp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/wolfscp.c b/src/wolfscp.c
index 33b2dfd..8c0e5b8 100644
--- a/src/wolfscp.c
+++ b/src/wolfscp.c
@@ -1053,6 +1053,7 @@ static int ParseBasePathHelper(WOLFSSH* ssh, int cmdSz)
     ScpSendCtx ctx;
     int ret = WS_SUCCESS;
 
+    WMEMSET(&ctx, 0, sizeof(ScpSendCtx));
     if (ScpPushDir(&ctx, ssh->scpBasePath, ssh->ctx->heap) != WS_SUCCESS) {
         /* case of file, not directory */
         char buf[cmdSz + 4];
@@ -1069,6 +1070,12 @@ static int ParseBasePathHelper(WOLFSSH* ssh, int cmdSz)
         clean_path(buf);
 
         idx = (int)WSTRLEN(buf) + 1; /* +1 for delimiter */
+#ifdef WOLFSSL_NUCLEUS
+        /* no delimiter to skip in case of at base address */
+        if (idx == 4) { /* case of 4 for drive letter plus ":\" + 1 */
+            idx--;
+        }
+#endif
         if (idx > cmdSz || idx > sz) {
             return WS_BUFFER_E;
         }