diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-19 10:53:41 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-19 10:53:41 -0700 |
| commit | 32873cd0ddea7df8062213bb025beb6fb070e59d (patch) | |
| tree | 078c9a8f85df2caa59379cf7123af32ac4b00b80 | |
| parent | dcea4ec698dcae39b7bba6f6aa08933cbfee6755 (diff) | |
| parent | c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b (diff) | |
| download | php-git-32873cd0ddea7df8062213bb025beb6fb070e59d.tar.gz | |
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src:
fix using wrong buffer pointer
| -rw-r--r-- | ext/openssl/openssl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index c7a9f5c181..e7672e4a34 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1502,6 +1502,7 @@ PHP_FUNCTION(openssl_x509_parse) bio_out = BIO_new(BIO_s_mem()); if (nid == NID_subject_alt_name) { if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) { + BIO_get_mem_ptr(bio_out, &bio_buf); add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1); } else { zval_dtor(return_value); |