Add a simple test for the z modifier

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3064)

diff --git a/test/bioprinttest.c b/test/bioprinttest.c
index b2d26225e52cb54bfedd2808423b2eed97262d48..c3ab6a179fc7e057bc48ae32b3c61b2552c4d263 100644 (file)
--- a/test/bioprinttest.c
+++ b/test/bioprinttest.c
@@ -10,6 +10,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <openssl/bio.h>
+#include "internal/numbers.h"
+
+#define nelem(x) (sizeof(x)/sizeof((x)[0]))
 
 static int justprint = 0;
 
@@ -138,10 +141,42 @@ static void dofptest(int test, double val, char *width, int prec, int *fail)
     }
 }
 
+struct z_data_st {
+    size_t value;
+    const char *format;
+    const char *expected;
+};
+static struct z_data_st zu_data[] = {
+    { SIZE_MAX, "%zu", (sizeof(size_t) == 4 ? "4294967295"
+                        : sizeof(size_t) == 8 ? "18446744073709551615"
+                        : "") },
+    /*
+     * in 2-complement, the unsigned number divided by two plus one becomes the
+     * smallest possible negative signed number of the corresponding type
+     */
+    { SIZE_MAX / 2 + 1, "%zi", (sizeof(size_t) == 4 ? "-2147483648"
+                                : sizeof(size_t) == 8 ? "-9223372036854775808"
+                                : "") },
+    { 0, "%zu", "0" },
+    { 0, "%zi", "0" },
+};
+
+static void dozutest(int test, const struct z_data_st *data, int *fail)
+{
+    char bio_buf[80];
+
+    BIO_snprintf(bio_buf, sizeof(bio_buf) - 1, data->format, data->value);
+    if (strcmp(bio_buf, data->expected) != 0) {
+        printf("Test %d failed.  Expected \"%s\".  Got \"%s\". "
+               "Format \"%s\"\n", test, data->expected, bio_buf, data->format);
+        *fail = 1;
+    }
+}
+
 int main(int argc, char **argv)
 {
     int test = 0;
-    int i;
+    size_t i;
     int fail = 0;
     int prec = -1;
     char *width = "";
@@ -207,6 +242,16 @@ int main(int argc, char **argv)
         fail = 1;
     }
 
+    for (i = 0; i < nelem(zu_data); i++) {
+        dozutest(test++, &zu_data[i], &fail);
+    }
+
+#if 0
+    for (i = 0; i < nelem(zi_data); i++) {
+        dozitest(test++, &zu_data[i], &fail);
+    }
+#endif
+
 #ifndef OPENSSL_NO_CRYPTO_MDEBUG
     if (CRYPTO_mem_leaks_fp(stderr) <= 0)
         return 1;