commit 0dc3ed029a019c789283935a6fb10e7b7769d4a2
author Paul Elliott <62069445+paul-elliott-arm@users.noreply.github.com> Fri Dec 08 12:23:05 2023 +0000
committer GitHub <noreply@github.com> Fri Dec 08 12:23:05 2023 +0000
tree df7bf47897921ddd6132deb7b0591f2422a16c32
parent f09b8379775658f9bceb5a200f7eaea2785600ba
parent 05fde60d896475df638e603c28f63e8c46055639

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

[Backport 2.28] Fix potential double-free in calloc selftest

programs/test/selftest.c

diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 2b78a8c..b9ba1e4 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -83,6 +83,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");
@@ -107,6 +108,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");
@@ -123,6 +125,7 @@
             mbedtls_printf("  CALLOC(1): failed (same buffer twice)\n");
         }
         ++failures;
+        buffer2 = NULL;
     } else {
         if (verbose) {
             mbedtls_printf("  CALLOC(1): passed\n");