Fix minor issues

Author: yosuke-wolfssl

src/internal.c

@@ -1501,6 +1501,8 @@ int IdentifyAsn1Key(const byte* in, word32 inSz, int isPrivate, void* heap,
                 /* If decode was successful, this is an RSA key. */
                 if (ret == 0) {
                     key->keyId = ID_SSH_RSA;
+                } else {
+                    wc_FreeRsaKey(&key->ks.rsa.key);
                 }
             }
         }
@@ -1533,7 +1535,12 @@ int IdentifyAsn1Key(const byte* in, word32 inSz, int isPrivate, void* heap,
                         case ECC_SECP521R1:
                             key->keyId = ID_ECDSA_SHA2_NISTP521;
                             break;
+                        default:
+                            /* Not a supported curve, so free the key */
+                            wc_ecc_free(&key->ks.ecc.key);
                     }
+                } else {
+                    wc_ecc_free(&key->ks.ecc.key);
                 }
             }
         }
@@ -1552,11 +1559,14 @@ int IdentifyAsn1Key(const byte* in, word32 inSz, int isPrivate, void* heap,
                     ret = wc_Ed25519PublicKeyDecode(in, &idx,
                             &key->ks.ed25519.key, inSz);
                 }
-            }
 
-            /* If decode was successful, this is a Ed25519 key. */
-            if (ret == 0)
-                key->keyId = ID_ED25519;
+                /* If decode was successful, this is a Ed25519 key. */
+                if (ret == 0) {
+                    key->keyId = ID_ED25519;
+                } else {
+                    wc_ed25519_free(&key->ks.ed25519.key);
+                }
+            }
         }
 #endif /* WOLFSSH_NO_ED25519 */
 
@@ -13047,7 +13057,7 @@ int SendKexDhReply(WOLFSSH* ssh)
             else if (useEcc) {
                 ret = KeyAgreeEcdh_server(ssh, hashId, f_ptr, &fSz);
             }
-            if (useCurve25519) {
+            else if (useCurve25519) {
                 ret = KeyAgreeCurve25519_server(ssh, hashId, f_ptr, &fSz);
             }
             else if (useEccMlKem) {

src/wolfsftp.c

@@ -2775,7 +2775,6 @@ static int SFTP_CreateLongName(WS_SFTPNAME* name)
 
     name->lName = (char*)WMALLOC(totalSz + 1, name->heap, DYNTYPE_SFTP);
     if (name->lName == NULL) {
-        WFREE(name->lName, name->heap, DYNTYPE_SFTP);
         return WS_MEMORY_E;
     }
     name->lSz = totalSz;
@@ -3985,6 +3984,7 @@ int wolfSSH_SFTP_RecvRead(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
     if (res != NULL) {
         if (wolfSSH_SFTP_CreateStatus(ssh, type, reqId, res, "English", NULL,
                 &outSz) != WS_SIZE_ONLY) {
+            WFREE(out, ssh->ctx->heap, DYNTYPE_BUFFER);
             return WS_FATAL_ERROR;
         }
         if (outSz > strSz) {
@@ -5280,6 +5280,7 @@ int wolfSSH_SFTP_RecvFSTAT(WOLFSSH* ssh, int reqId, byte* data, word32 maxSz)
     if (ret == WS_SUCCESS) {
         if (SFTP_SetHeader(ssh, reqId, WOLFSSH_FTP_ATTRS, sz, out)
                 != WS_SUCCESS) {
+            WFREE(out, ssh->ctx->heap, DYNTYPE_BUFFER);
             return WS_FATAL_ERROR;
         }
         SFTP_SetAttributes(ssh, out + WOLFSSH_SFTP_HEADER, sz, &atr);