Fix for memory leak

wolfSSL · Dec 18, 2024 · 9d2951b · 9d2951b
1 parent e153afd
commit 9d2951b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/internal.c b/src/internal.c
@@ -1338,7 +1338,8 @@ int IdentifyAsn1Key(const byte* in, word32 inSz, int isPrivate, void* heap,
             ret = key->keySigId;
         }
 
-        if (pkey == NULL || ret == WS_UNIMPLEMENTED_E) {
+        /* if not returning key then free it */
+        if (pkey == NULL || *pkey == NULL) {
             wolfSSH_KEY_clean(key);
             WFREE(key, heap, dynType);
             key = NULL;

diff --git a/src/ssh.c b/src/ssh.c
@@ -1751,7 +1751,7 @@ static int DoAsn1Key(const byte* in, word32 inSz, byte** out,
             c32toa((word32)WSTRLEN(keyFormat), &newKey[idx]);
             idx += LENGTH_SZ;
             WMEMCPY(&newKey[idx], keyFormat, (word32)WSTRLEN(keyFormat));
-            idx += WSTRLEN(keyFormat);
+            idx += (word32)WSTRLEN(keyFormat);
 
             /* encode public exponent (e) */
             c32toa(eSz, &newKey[idx]);
@@ -1795,6 +1795,8 @@ static int DoAsn1Key(const byte* in, word32 inSz, byte** out,
     }
 
     wolfSSH_KEY_clean(key);
+    WFREE(key, heap, isPrivate ? DYNTYPE_PRIVKEY : DYNTYPE_PUBKEY);
+
     if (*out == NULL) {
         WFREE(newKey, heap, DYNTYPE_PRIVKEY);
     }