root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

test/bioprinttest.c: move the %n result to the field that is later checked 

The test_n test implicitly assumed a certain union layout, as the %n was
writing to the union field in accordance with the length modifier being
tested, but comparison of the expected value was dan agains the val field,
and that is incorrect, especially on big-endian architectures.  Fix that
by explicitly assigning the result to the val field of the union and
updating the expected values where the resulting value overflows
into negative.

Fixes: 9deaf83833 "test/bioprinttest.c: add some checks for integer and string printing"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28388)
This commit is contained in:
Eugene Syromiatnikov 2025-08-29 19:45:07 +02:00 committed by Neil Horman
parent e489bfbcd5
commit 0b00e23df8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/bioprinttest.c
View File

@ -464,7 +464,7 @@ static const struct n_data {
AT_CHAR, 10, AT_INT, { .i = 1234567890 } }, AT_CHAR, 10, AT_INT, { .i = 1234567890 } },
{ "%#.200" PRIXPTR "%hhn", { "%#.200" PRIXPTR "%hhn",
"0X0000000000000000000000000000000000000000000000000000000000000", "0X0000000000000000000000000000000000000000000000000000000000000",
AT_CHAR, 202, AT_INT, { .i = 1234567890 }, AT_CHAR, -54, AT_INT, { .i = 1234567890 },
.skip_libc_ret_check = true, .exp_ret = -1 }, .skip_libc_ret_check = true, .exp_ret = -1 },
{ "%#10000" PRIoPTR "%hhn1234567890", { "%#10000" PRIoPTR "%hhn1234567890",
" ", " ",
@ -475,7 +475,7 @@ static const struct n_data {
AT_SHORT, 0, AT_INT, { .s = "1234567890" } }, AT_SHORT, 0, AT_INT, { .s = "1234567890" } },
{ "%-123456s%hn0987654321", { "%-123456s%hn0987654321",
"1234567890 ", "1234567890 ",
AT_SHORT, 57920, AT_INT, { .s = "1234567890" }, AT_SHORT, -7616, AT_INT, { .s = "1234567890" },
.skip_libc_ret_check = true, .exp_ret = -1 }, .skip_libc_ret_check = true, .exp_ret = -1 },
{ "%1234567898.1234567890" PRIxPTR "%n", { "%1234567898.1234567890" PRIxPTR "%n",
" 0000000000000000000000000000000000000000000000000000000", " 0000000000000000000000000000000000000000000000000000000",
@ -516,7 +516,8 @@ static const struct n_data {
.skip_libc_check = true, .exp_ret = -1 }, .skip_libc_check = true, .exp_ret = -1 },
{ "=%2147483639s=%888888888X=%tn=", { "=%2147483639s=%888888888X=%tn=",
"= ", "= ",
AT_PTRDIFF, 3036372530U, AT_STR, { .s = NULL }, AT_INT, { .i = 0xdead }, AT_PTRDIFF, sizeof(ptrdiff_t) == 8 ? 3036372530LL : -1258594766LL,
AT_STR, { .s = NULL }, AT_INT, { .i = 0xdead },
.skip_libc_check = true, .exp_ret = -1 }, .skip_libc_check = true, .exp_ret = -1 },
}; };
@ -593,6 +594,8 @@ static int test_n(int i)
std_ret = snprintf(std_buf, sizeof(std_buf), data->format, \ std_ret = snprintf(std_buf, sizeof(std_buf), data->format, \
data->arg1.i, data->arg2.i, &std_n.field_); \ data->arg1.i, data->arg2.i, &std_n.field_); \
} \ } \
n.val = n.field_; \
std_n.val = std_n.field_; \
} while (0) } while (0)
case AT_CHAR: case AT_CHAR:
DO_PRINT(hh); DO_PRINT(hh);