commit 0f60c673f0ce5d83f4c8104b2818be78ac1bc01e
author Paul Elliott <62069445+paul-elliott-arm@users.noreply.github.com> Fri Dec 08 12:23:13 2023 +0000
committer GitHub <noreply@github.com> Fri Dec 08 12:23:13 2023 +0000
tree d45038c0a74cff30145189e56e5ef97187ba9f01
parent 90d07118ad0108b9d1f61524173d801c6e8ce781
parent 64cd2f21edfee11451768b0e793801d28752532e

Merge pull request #8619 from davidhorstmann-arm/fix-selftest-doublefree

Fix potential double-free in calloc selftest

programs/test/selftest.c

diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 61dde5e..e132e4c 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -79,6 +79,7 @@
         if (verbose) {
             mbedtls_printf("  CALLOC(0,1): passed (same non-null)\n");
         }
+        empty2 = NULL;
     } else {
         if (verbose) {
             mbedtls_printf("  CALLOC(0,1): passed (distinct non-null)\n");
@@ -103,6 +104,7 @@
         if (verbose) {
             mbedtls_printf("  CALLOC(1,0): passed (same non-null)\n");
         }
+        empty2 = NULL;
     } else {
         if (verbose) {
             mbedtls_printf("  CALLOC(1,0): passed (distinct non-null)\n");
@@ -119,6 +121,7 @@
             mbedtls_printf("  CALLOC(1): failed (same buffer twice)\n");
         }
         ++failures;
+        buffer2 = NULL;
     } else {
         if (verbose) {
             mbedtls_printf("  CALLOC(1): passed\n");