zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core_namemap.c: Use OPENSSL_STRING instead of defining STRING type

Browse Source 
Also avoid leak if stack push fails.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/26230)
This commit is contained in:
Tomas Mraz 2024-12-20 17:20:04 +01:00
parent 4f37e543d9
commit 0baa3ac736
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crypto/core_namemap.c
View File

@ -24,10 +24,8 @@ HT_END_KEY_DEFN(NAMENUM_KEY)
* ================== * ==================
*/ */
typedef char STRING; typedef STACK_OF(OPENSSL_STRING) NAMES;
typedef STACK_OF(STRING) NAMES;
DEFINE_STACK_OF(STRING)
DEFINE_STACK_OF(NAMES) DEFINE_STACK_OF(NAMES)
struct ossl_namemap_st { struct ossl_namemap_st {
@ -49,7 +47,7 @@ static void name_string_free(char *name)
static void names_free(NAMES *n) static void names_free(NAMES *n)
{ {
sk_STRING_pop_free(n, name_string_free); sk_OPENSSL_STRING_pop_free(n, name_string_free);
} }
/* OSSL_LIB_CTX_METHOD functions for a namemap stored in a library context */ /* OSSL_LIB_CTX_METHOD functions for a namemap stored in a library context */
@ -125,17 +123,17 @@ int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,
names = sk_NAMES_value(namemap->numnames, number - 1); names = sk_NAMES_value(namemap->numnames, number - 1);
if (names != NULL) if (names != NULL)
names = sk_STRING_dup(names); names = sk_OPENSSL_STRING_dup(names);
CRYPTO_THREAD_unlock(namemap->lock); CRYPTO_THREAD_unlock(namemap->lock);
if (names == NULL) if (names == NULL)
return 0; return 0;
for (i = 0; i < sk_STRING_num(names); i++) for (i = 0; i < sk_OPENSSL_STRING_num(names); i++)
fn(sk_STRING_value(names, i), data); fn(sk_OPENSSL_STRING_value(names, i), data);
sk_STRING_free(names); sk_OPENSSL_STRING_free(names);
return i > 0; return i > 0;
} }
@ -194,7 +192,7 @@ const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
names = sk_NAMES_value(namemap->numnames, number - 1); names = sk_NAMES_value(namemap->numnames, number - 1);
if (names != NULL) if (names != NULL)
ret = sk_STRING_value(names, idx); ret = sk_OPENSSL_STRING_value(names, idx);
CRYPTO_THREAD_unlock(namemap->lock); CRYPTO_THREAD_unlock(namemap->lock);
@ -216,7 +214,7 @@ static int numname_insert(OSSL_NAMEMAP *namemap, int number,
} }
} else { } else {
/* a completely new entry */ /* a completely new entry */
names = sk_STRING_new_null(); names = sk_OPENSSL_STRING_new_null();
if (names == NULL) if (names == NULL)
return 0; return 0;
} }
@ -224,8 +222,9 @@ static int numname_insert(OSSL_NAMEMAP *namemap, int number,
if ((tmpname = OPENSSL_strdup(name)) == NULL) if ((tmpname = OPENSSL_strdup(name)) == NULL)
goto err; goto err;
if (!sk_STRING_push(names, tmpname)) if (!sk_OPENSSL_STRING_push(names, tmpname))
goto err; goto err;
tmpname = NULL;
if (number <= 0) { if (number <= 0) {
if (!sk_NAMES_push(namemap->numnames, names)) if (!sk_NAMES_push(namemap->numnames, names))
@ -236,7 +235,7 @@ static int numname_insert(OSSL_NAMEMAP *namemap, int number,
err: err:
if (number <= 0) if (number <= 0)
sk_STRING_free(names); sk_OPENSSL_STRING_pop_free(names, name_string_free);
OPENSSL_free(tmpname); OPENSSL_free(tmpname);
return 0; return 0;
} }