Skip to content

Commit 08a9579

Browse files
committed
Fix memory leak of X509_STORE in php_openssl_setup_verify() on failure
Closes GH-18750.
1 parent 9187cae commit 08a9579

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ PHP NEWS
1919
. Fix memory leak in intl_datetime_decompose() on failure. (nielsdos)
2020
. Fix memory leak in locale lookup on failure. (nielsdos)
2121

22+
- OpenSSL:
23+
. Fix memory leak of X509_STORE in php_openssl_setup_verify() on failure.
24+
(nielsdos)
25+
2226
- Phar:
2327
. Add missing filter cleanups on phar failure. (nielsdos)
2428
. Fixed bug GH-18642 (Signed integer overflow in ext/phar fseek). (nielsdos)

ext/openssl/openssl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,6 +2421,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist, uint32_t arg_num)
24212421
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(calist), item) {
24222422
zend_string *str = zval_try_get_string(item);
24232423
if (UNEXPECTED(!str)) {
2424+
X509_STORE_free(store);
24242425
return NULL;
24252426
}
24262427

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--TEST--
2+
Memory leak of X509_STORE in php_openssl_setup_verify() on failure
3+
--EXTENSIONS--
4+
openssl
5+
--FILE--
6+
<?php
7+
8+
class MyStringable{
9+
public function __toString(): string {
10+
throw new Error('stop');
11+
}
12+
}
13+
14+
try {
15+
openssl_pkcs7_verify("does not matter", 0, "does not matter", [new MyStringable]);
16+
} catch (Error $e) {
17+
echo $e->getMessage(), "\n";
18+
}
19+
20+
?>
21+
--EXPECT--
22+
stop

0 commit comments

Comments
 (0)