Skip to content

Commit cf96aa1

Browse files
committed
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: fix using wrong buffer pointer
2 parents 14f5732 + c1c49d6 commit cf96aa1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

ext/openssl/openssl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,6 +1563,7 @@ PHP_FUNCTION(openssl_x509_parse)
15631563
bio_out = BIO_new(BIO_s_mem());
15641564
if (nid == NID_subject_alt_name) {
15651565
if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) {
1566+
BIO_get_mem_ptr(bio_out, &bio_buf);
15661567
add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1);
15671568
} else {
15681569
zval_dtor(return_value);

0 commit comments

Comments
 (0)