summaryrefslogtreecommitdiffstats
path: root/crypto/ex_data.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-09-10 16:34:17 +0100
committerMatt Caswell <matt@openssl.org>2020-09-13 11:11:57 +0100
commit225c9660a5a3435d9bcfc9166b9f79f132996249 (patch)
tree31946bc12bc24f141558a542b79c31a693de2de6 /crypto/ex_data.c
parent89b46350a322f85924d1226f7c149e4e068d0264 (diff)
Ignore unused return values from some sk_*() macros
Some compilers are very picky about unused return values. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12781)
Diffstat (limited to 'crypto/ex_data.c')
-rw-r--r--crypto/ex_data.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index cc9ebc36f4..c1467a51dc 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -445,7 +445,11 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
return 0;
}
}
- sk_void_set(ad->sk, idx, val);
+ if (sk_void_set(ad->sk, idx, val) != val) {
+ /* Probably the index is out of bounds */
+ CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_PASSED_INVALID_ARGUMENT);
+ return 0;
+ }
return 1;
}