diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-04-18 17:46:32 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-04-19 10:24:16 +0200 |
| commit | 1393722af384cdf310645c598bbd06a3bbaa2f31 (patch) | |
| tree | 5ea41ac9b64177cbebebfe2cf151d3abc99d332e | |
| parent | bcb5d42171386709c716312b711a0c15aa368f3f (diff) | |
ossl_method_store_cache_get(): ensure non-NULL property query
The comparator further down the call stack doesn't tolerate NULL, so
if we got that as input, use the empty string.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8781)
| -rw-r--r-- | crypto/property/property.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/property/property.c b/crypto/property/property.c index 1a3d0c480d..a2122dc1bc 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -450,7 +450,7 @@ int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, int nid, return 0; } - elem.query = prop_query; + elem.query = prop_query != NULL ? prop_query : ""; r = lh_QUERY_retrieve(alg->cache, &elem); if (r == NULL) { ossl_property_unlock(store); |