summaryrefslogtreecommitdiffstats
path: root/crypto/property
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-06-29 00:33:35 +0200
committerPauli <paul.dale@oracle.com>2020-07-05 05:20:09 +0200
commit6f924bb89ecb792dc1ecaa3454086f3772ba5c74 (patch)
tree8531644007752a61125bf46a999ee7eb99970f21 /crypto/property
parentcmp: remove NULL check. (diff)
downloadopenssl-6f924bb89ecb792dc1ecaa3454086f3772ba5c74.tar.xz
openssl-6f924bb89ecb792dc1ecaa3454086f3772ba5c74.zip
coverity 1464984: Null pointer dereferences
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12309)
Diffstat (limited to 'crypto/property')
-rw-r--r--crypto/property/property.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/property/property.c b/crypto/property/property.c
index a72ccb02b4..a3b52ee44d 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -324,7 +324,7 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store, int nid,
const char *prop_query,
void **method)
{
- OSSL_PROPERTY_LIST **plp = ossl_ctx_global_properties(store->ctx);
+ OSSL_PROPERTY_LIST **plp;
ALGORITHM *alg;
IMPLEMENTATION *impl;
OSSL_PROPERTY_LIST *pq = NULL, *p2 = NULL;
@@ -350,9 +350,9 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store, int nid,
return 0;
}
- if (prop_query != NULL) {
+ if (prop_query != NULL)
p2 = pq = ossl_parse_query(store->ctx, prop_query);
- }
+ plp = ossl_ctx_global_properties(store->ctx);
if (plp != NULL && *plp != NULL) {
if (pq == NULL) {
pq = *plp;