Change the cleanup phase

Author: yosuke-wolfssl

src/internal.c

@@ -15456,15 +15456,6 @@ int SendUserAuthKeyboardResponse(WOLFSSH* ssh)
         WLOG(WS_LOG_DEBUG, "SUAR: Calling the userauth callback");
         authRet = ssh->ctx->userAuthCb(WOLFSSH_USERAUTH_KEYBOARD, &authData,
                            ssh->userAuthCtx);
-
-        WFREE(ssh->kbAuth.promptName, ssh->ctx->heap, 0);
-        WFREE(ssh->kbAuth.promptInstruction, ssh->ctx->heap, 0);
-        WFREE(ssh->kbAuth.promptLanguage, ssh->ctx->heap, 0);
-        WFREE(ssh->kbAuth.promptEcho, ssh->ctx->heap, 0);
-        for (prompt = 0; prompt < ssh->kbAuth.promptCount; prompt++) {
-            WFREE((void*)ssh->kbAuth.prompts[prompt], ssh->ctx->heap, 0);
-        }
-        WFREE(ssh->kbAuth.prompts, ssh->ctx->heap, 0);
     }
 
     if (ret == WS_SUCCESS) {
@@ -15482,6 +15473,26 @@ int SendUserAuthKeyboardResponse(WOLFSSH* ssh)
         }
     }
 
+    if (ssh != NULL && ssh->ctx != NULL) {
+        WFREE(ssh->kbAuth.promptName, ssh->ctx->heap, 0);
+        WFREE(ssh->kbAuth.promptInstruction, ssh->ctx->heap, 0);
+        WFREE(ssh->kbAuth.promptLanguage, ssh->ctx->heap, 0);
+        WFREE(ssh->kbAuth.promptEcho, ssh->ctx->heap, 0);
+        if (ssh->kbAuth.prompts != NULL) {
+            for (prompt = 0; prompt < ssh->kbAuth.promptCount; prompt++) {
+                WFREE((void*)ssh->kbAuth.prompts[prompt], ssh->ctx->heap, 0);
+            }
+        }
+        WFREE(ssh->kbAuth.prompts, ssh->ctx->heap, 0);
+
+        ssh->kbAuth.promptName = NULL;
+        ssh->kbAuth.promptInstruction = NULL;
+        ssh->kbAuth.promptLanguage = NULL;
+        ssh->kbAuth.promptEcho = NULL;
+        ssh->kbAuth.prompts = NULL;
+        ssh->kbAuth.promptCount = 0;
+    }
+
     payloadSz = MSG_ID_SZ;
 
     if (ret == WS_SUCCESS) {