Skip to content

Fix memory leaks when sk_X509_new_null() fails #20957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ndossche wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+9 −0
Open

Fix memory leaks when sk_X509_new_null() fails #20957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ext/openssl/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2552,6 +2552,9 @@ static STACK_OF(X509) *php_array_to_X509_sk(zval * zcerts, uint32_t arg_num, con
bool free_cert;

sk = sk_X509_new_null();
if (sk == NULL) {
goto clean_exit;
}

/* get certs */
if (Z_TYPE_P(zcerts) == IS_ARRAY) {
Expand Down Expand Up @@ -5797,6 +5800,9 @@ PHP_FUNCTION(openssl_pkcs7_encrypt)
}

recipcerts = sk_X509_new_null();
if (recipcerts == NULL) {
goto clean_exit;
}

/* get certs */
if (Z_TYPE_P(zrecipcerts) == IS_ARRAY) {
Expand Down Expand Up @@ -6404,6 +6410,9 @@ PHP_FUNCTION(openssl_cms_encrypt)
}

recipcerts = sk_X509_new_null();
if (recipcerts == NULL) {
goto clean_exit;
}

/* get certs */
if (Z_TYPE_P(zrecipcerts) == IS_ARRAY) {
Expand Down
Loading