public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Free data if sk_OPENSSL_STRING_push fails.

Browse source 
Fixes #26203

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26227)
This commit is contained in:
Frederik Wedel-Heinen 2024-12-20 15:45:53 +01:00 • committed by Tomas Mraz
parent dfce0d7418
commit 2457fc4816
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crypto/x509/by_store.c
View file

@ -122,7 +122,11 @@ static int by_store_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
uris = sk_OPENSSL_STRING_new_null();
X509_LOOKUP_set_method_data(ctx, uris);
}
return sk_OPENSSL_STRING_push(uris, data) > 0;
if (sk_OPENSSL_STRING_push(uris, data) <= 0) {
OPENSSL_free(data);
return 0;
}
return 1;
}
/* NOP if no URI is given. */
return 1;

8
test/evp_test.c
View file

@ -202,7 +202,13 @@ static int ctrladd(STACK_OF(OPENSSL_STRING) *controls, const char *value)
if (data == NULL)
return -1;
return sk_OPENSSL_STRING_push(controls, data) > 0;
if (sk_OPENSSL_STRING_push(controls, data) <= 0) {
OPENSSL_free(data);
return -1;
}
return 1;
}
/* Because OPENSSL_free is a macro, it can't be passed as a function pointer */