Fix some undefined behaviour in stack test
At one point the stack was passing a pointer of the element *before* an
array which is undefined.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2971)
diff --git a/test/stack_test.c b/test/stack_test.c
index f04f6af..4325766 100644
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -57,6 +57,7 @@
static int test_int_stack(void)
{
static int v[] = { 1, 2, -4, 16, 999, 1, -173, 1, 9 };
+ static int notpresent = -1;
const int n = OSSL_NELEM(v);
static struct {
int value;
@@ -108,18 +109,26 @@
}
/* find unsorted -- the pointers are compared */
- for (i = 0; i < n_finds; i++)
- if (sk_sint_find(s, v + finds[i].unsorted) != finds[i].unsorted) {
+ for (i = 0; i < n_finds; i++) {
+ int *val = (finds[i].unsorted == -1) ? ¬present
+ : v + finds[i].unsorted;
+
+ if (sk_sint_find(s, val) != finds[i].unsorted) {
fprintf(stderr, "test int unsorted find %d\n", i);
goto end;
}
+ }
/* find_ex unsorted */
- for (i = 0; i < n_finds; i++)
- if (sk_sint_find_ex(s, v + finds[i].unsorted) != finds[i].unsorted) {
+ for (i = 0; i < n_finds; i++) {
+ int *val = (finds[i].unsorted == -1) ? ¬present
+ : v + finds[i].unsorted;
+
+ if (sk_sint_find_ex(s, val) != finds[i].unsorted) {
fprintf(stderr, "test int unsorted find_ex %d\n", i);
goto end;
}
+ }
/* sorting */
if (sk_sint_is_sorted(s)) {