clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.php.net:php-src

Browse Source 
* 'master' of git.php.net:php-src:
  follow up fix on bug #74022
This commit is contained in:
Dmitry Stogov 2017-05-18 13:18:47 +03:00
commit b1a07d430b
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/openssl/openssl.c
View File

@ -2940,6 +2940,7 @@ PHP_FUNCTION(openssl_pkcs12_read)
if (d2i_PKCS12_bio(bio_in, &p12) && PKCS12_parse(p12, pass, &pkey, &cert, &ca)) {
BIO * bio_out;
int cert_num;
zval_dtor(zout);
array_init(zout);
@ -2970,10 +2971,11 @@ PHP_FUNCTION(openssl_pkcs12_read)
BIO_free(bio_out);
}
if (ca && sk_X509_num(ca)) {
cert_num = sk_X509_num(ca);
if (ca && cert_num) {
array_init(&zextracerts);
for (i = 0; i < sk_X509_num(ca); i++) {
for (i = 0; i < cert_num; i++) {
zval zextracert;
X509* aCA = sk_X509_pop(ca);
if (!aCA) break;

24
ext/openssl/tests/bug74022_2.phpt Normal file
View File

File diff suppressed because one or more lines are too long