Fix the resource management

Author: yosuke-wolfssl

src/wolfsftp.c

@@ -2172,17 +2172,17 @@ int wolfSSH_SFTP_RecvOpen(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
     }
 #endif
 
-    if (ret == WS_SUCCESS) {
-        /* create packet */
-        out = (byte*)WMALLOC(outSz, ssh->ctx->heap, DYNTYPE_BUFFER);
-        if (out == NULL) {
+    /* create packet */
+    out = (byte*)WMALLOC(outSz, ssh->ctx->heap, DYNTYPE_BUFFER);
+    if (out == NULL) {
+        if (ret == WS_SUCCESS) {
         #ifdef MICROCHIP_MPLAB_HARMONY
             WFCLOSE(ssh->fs, &fd);
         #else
             WCLOSE(ssh->fs, fd);
         #endif
-            return WS_MEMORY_E;
         }
+        return WS_MEMORY_E;
     }
     if (ret == WS_SUCCESS) {
         if (SFTP_CreatePacket(ssh, WOLFSSH_FTP_HANDLE, out, outSz,
@@ -2192,20 +2192,21 @@ int wolfSSH_SFTP_RecvOpen(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
         #else
             WCLOSE(ssh->fs, fd);
         #endif
+            WFREE(out, ssh->ctx->heap, DYNTYPE_BUFFER);
             return WS_FATAL_ERROR;
         }
     }
     else {
+        if (fd >= 0) {
+        #ifdef MICROCHIP_MPLAB_HARMONY
+            WFCLOSE(ssh->fs, &fd);
+        #else
+            WCLOSE(ssh->fs, fd);
+        #endif
+        }
         if (wolfSSH_SFTP_CreateStatus(ssh, WOLFSSH_FTP_FAILURE, reqId, res,
                 "English", out, &outSz) != WS_SUCCESS) {
             WFREE(out, ssh->ctx->heap, DYNTYPE_BUFFER);
-            if (fd >= 0) {
-            #ifdef MICROCHIP_MPLAB_HARMONY
-                WFCLOSE(ssh->fs, &fd);
-            #else
-                WCLOSE(ssh->fs, fd);
-            #endif
-            }
             return WS_FATAL_ERROR;
         }
     }
@@ -2311,30 +2312,41 @@ int wolfSSH_SFTP_RecvOpen(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
     }
 
 #ifdef WOLFSSH_STOREHANDLE
-    if (SFTP_AddHandleNode(ssh,
-                (byte*)&fileHandle, sizeof(HANDLE), dir) != WS_SUCCESS) {
+    if (ret == WS_SUCCESS) {
+        if (SFTP_AddHandleNode(ssh,
+                    (byte*)&fileHandle, sizeof(HANDLE), dir) != WS_SUCCESS) {
             WLOG(WS_LOG_SFTP, "Unable to store handle");
             res = ier;
             if (wolfSSH_SFTP_CreateStatus(ssh, WOLFSSH_FTP_FAILURE, reqId, res,
                 "English", NULL, &outSz) != WS_SIZE_ONLY) {
+                CloseHandle(fileHandle);
                 return WS_FATAL_ERROR;
             }
             ret = WS_FATAL_ERROR;
+        }
     }
 #endif
 
     /* create packet */
     out = (byte*)WMALLOC(outSz, ssh->ctx->heap, DYNTYPE_BUFFER);
     if (out == NULL) {
+        if (ret == WS_SUCCESS) {
+            CloseHandle(fileHandle);
+        }
         return WS_MEMORY_E;
     }
     if (ret == WS_SUCCESS) {
         if (SFTP_CreatePacket(ssh, WOLFSSH_FTP_HANDLE, out, outSz,
             (byte*)&fileHandle, sizeof(HANDLE)) != WS_SUCCESS) {
+            CloseHandle(fileHandle);
+            WFREE(out, ssh->ctx->heap, DYNTYPE_BUFFER);
             return WS_FATAL_ERROR;
         }
     }
     else {
+        if (fileHandle != INVALID_HANDLE_VALUE) {
+            CloseHandle(fileHandle);
+        }
         if (wolfSSH_SFTP_CreateStatus(ssh, WOLFSSH_FTP_FAILURE, reqId, res,
                 "English", out, &outSz) != WS_SUCCESS) {
             WFREE(out, ssh->ctx->heap, DYNTYPE_BUFFER);