Fix memory errors

Author: julek-wolfssl

tests/api.c

@@ -3588,7 +3588,7 @@ static int test_wolfSSL_CTX_use_certificate_chain_buffer_format(void)
     wolfSSL_CTX_free(ctx);
 #ifndef NO_FILESYSTEM
     if (buf != NULL) {
-        free(buf);
+        XFREE(buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
 #endif
 #endif
@@ -11400,7 +11400,7 @@ static int test_wc_PemToDer(void)
     pDer = NULL;
 
     if (cert_buf != NULL) {
-        free(cert_buf);
+        XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         cert_buf = NULL;
     }
 
@@ -11412,7 +11412,7 @@ static int test_wc_PemToDer(void)
     pDer = NULL;
 
     if (cert_buf != NULL) {
-        free(cert_buf);
+        XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
         cert_buf = NULL;
     }
 
@@ -11434,7 +11434,7 @@ static int test_wc_PemToDer(void)
     #endif
         wc_FreeDer(&pDer);
         if (cert_buf != NULL)
-            free(cert_buf);
+            XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
 #endif
 #endif
@@ -11491,7 +11491,7 @@ static int test_wc_CertPemToDer(void)
     if (cert_der != NULL)
         free(cert_der);
     if (cert_buf != NULL)
-        free(cert_buf);
+        XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 #endif
     return EXPECT_RESULT();
 }
@@ -11605,7 +11605,7 @@ static int test_wc_PubKeyPemToDer(void)
     }
 
     if (cert_buf != NULL) {
-        free(cert_buf);
+        XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
 #endif
     return EXPECT_RESULT();
@@ -11994,7 +11994,7 @@ static int test_wc_CheckCertSigPubKey(void)
     if (cert_der != NULL)
         free(cert_der);
     if (cert_buf != NULL)
-        free(cert_buf);
+        XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 #endif
     return EXPECT_RESULT();
 }
@@ -20797,9 +20797,9 @@ static int test_RsaSigFailure_cm(void)
 #endif
     }
 
-    /* load_file() uses malloc. */
+    /* load_file() uses XMALLOC. */
     if (cert_buf != NULL) {
-        free(cert_buf);
+        XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
 #endif /* !NO_RSA */
     return EXPECT_RESULT();
@@ -20838,9 +20838,9 @@ static int test_EccSigFailure_cm(void)
 #endif
     }
 
-    /* load_file() uses malloc. */
+    /* load_file() uses XMALLOC. */
     if (cert_buf != NULL) {
-        free(cert_buf);
+        XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
 #ifdef FP_ECC
     wc_ecc_fp_free();
@@ -25251,7 +25251,7 @@ static int load_pem_key_file_as_der(const char* privKeyFile, DerBuffer** pDer,
     }
 
     if (key_buf != NULL) {
-        free(key_buf); key_buf = NULL;
+        XFREE(key_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER); key_buf = NULL;
     }
     (void)encInfo; /* not used in this test */
 

tests/api/test_certman.c

@@ -269,7 +269,7 @@ static int test_cm_load_ca_file(const char* ca_cert_file)
 
         if (ret == WOLFSSL_SUCCESS) {
             /* test including null terminator in length */
-            byte* tmp = (byte*)realloc(cert_buf, cert_sz+1);
+            byte* tmp = (byte*)XREALLOC(cert_buf, cert_sz+1, NULL, DYNAMIC_TYPE_TMP_BUFFER);
             if (tmp == NULL) {
                 ret = MEMORY_E;
             }
@@ -297,7 +297,7 @@ static int test_cm_load_ca_file(const char* ca_cert_file)
     #endif
 
     }
-    free(cert_buf);
+    XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
     return ret;
 }
@@ -339,7 +339,7 @@ static int test_cm_load_ca_file_ex(const char* ca_cert_file, word32 flags)
 
         if (ret == WOLFSSL_SUCCESS) {
             /* test including null terminator in length */
-            byte* tmp = (byte*)realloc(cert_buf, cert_sz+1);
+            byte* tmp = (byte*)XREALLOC(cert_buf, cert_sz+1, NULL, DYNAMIC_TYPE_TMP_BUFFER);
             if (tmp == NULL) {
                 ret = MEMORY_E;
             }
@@ -367,7 +367,7 @@ static int test_cm_load_ca_file_ex(const char* ca_cert_file, word32 flags)
     #endif
 
     }
-    free(cert_buf);
+    XFREE(cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
     return ret;
 }
@@ -614,13 +614,13 @@ int test_wolfSSL_CertManagerLoadCABufferType(void)
     if (cm)
         wolfSSL_CertManagerFree(cm);
     if (ca_cert_buf)
-        free(ca_cert_buf);
+        XFREE(ca_cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     if (int1_cert_buf)
-        free(int1_cert_buf);
+        XFREE(int1_cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     if (int2_cert_buf)
-        free(int2_cert_buf);
+        XFREE(int2_cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     if (client_cert_buf)
-        free(client_cert_buf);
+        XFREE(client_cert_buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 #endif
 
     return EXPECT_RESULT();

wolfcrypt/src/memory.c

@@ -313,7 +313,7 @@ void wc_MemZero_Check(void* addr, size_t len)
         nextIdx--;
         if (nextIdx > 0) {
             /* Remove entry. */
-            XMEMCPY(memZero + i, memZero + i + 1,
+            XMEMMOVE(memZero + i, memZero + i + 1,
                 sizeof(MemZero) * (nextIdx - i));
             /* Clear out top to make it easier to see what is to be checked. */
             XMEMSET(&memZero[nextIdx], 0, sizeof(MemZero));