1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  follow up fix on bug #74022
This commit is contained in:
Anatol Belski
2017-05-18 12:07:09 +02:00
2 changed files with 28 additions and 2 deletions
+4 -2
View File
@@ -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;
File diff suppressed because one or more lines are too long