diff options
| author | Anatol Belski <ab@php.net> | 2017-05-18 12:07:09 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-05-18 12:07:09 +0200 |
| commit | 26f217bf4078096707b916f33db4e8e37b016093 (patch) | |
| tree | e4c6bbd6793002307088504e03e9b72ca2cddddc /ext/openssl/openssl.c | |
| parent | 649494c0ee54102ac4a6c62fd5faf38143efb107 (diff) | |
| parent | 464c1639ae544e3952823caf169d2e4199a32fc3 (diff) | |
| download | php-git-26f217bf4078096707b916f33db4e8e37b016093.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
follow up fix on bug #74022
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 766178b8f7..c1aa19679e 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -2941,6 +2941,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); @@ -2971,10 +2972,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; |