commit 17d2fb85217fb737f79cef54f04706950a38c219
author Paul Elliott <62069445+paul-elliott-arm@users.noreply.github.com> Wed Sep 04 08:49:04 2024 +0000
committer GitHub <noreply@github.com> Wed Sep 04 08:49:04 2024 +0000
tree 52637d4c3dcd77555b9e9fcd540d24da7df67638
parent 42c82aefed98c4b87c69e355eb146864a850270e
parent 990a88cd53d40ff42481a2c200b05f656507f326

Merge pull request #9529 from jaimeMF/backport-gcc-14-calloc-fix

[Backport 2.28] tests: fix calloc() argument list (gcc-14 fix)

tests/include/test/macros.h

diff --git a/tests/include/test/macros.h b/tests/include/test/macros.h
index 894fc67..3c347e1 100644
--- a/tests/include/test/macros.h
+++ b/tests/include/test/macros.h
@@ -135,8 +135,8 @@
     do {                                                    \
         TEST_ASSERT((pointer) == NULL);                     \
         if ((item_count) != 0) {                            \
-            (pointer) = mbedtls_calloc(sizeof(*(pointer)),  \
-                                       (item_count));       \
+            (pointer) = mbedtls_calloc((item_count),        \
+                                       sizeof(*(pointer))); \
             TEST_ASSERT((pointer) != NULL);                 \
         }                                                   \
     } while (0)
@@ -165,8 +165,8 @@
 #define TEST_CALLOC_NONNULL(pointer, item_count)            \
     do {                                                    \
         TEST_ASSERT((pointer) == NULL);                     \
-        (pointer) = mbedtls_calloc(sizeof(*(pointer)),      \
-                                   (item_count));           \
+        (pointer) = mbedtls_calloc((item_count),            \
+                                   sizeof(*(pointer)));     \
         if (((pointer) == NULL) && ((item_count) == 0)) {   \
             (pointer) = mbedtls_calloc(1, 1);               \
         }                                                   \
@@ -185,8 +185,8 @@
     do {                                                    \
         TEST_ASSERT((pointer) == NULL);                     \
         if ((item_count) != 0) {                            \
-            (pointer) = mbedtls_calloc(sizeof(*(pointer)),  \
-                                       (item_count));       \
+            (pointer) = mbedtls_calloc((item_count),        \
+                                       sizeof(*(pointer))); \
             TEST_ASSUME((pointer) != NULL);                 \
         }                                                   \
     } while (0)