diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-19 01:03:18 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-19 01:03:18 -0700 |
| commit | cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4 (patch) | |
| tree | 0f771d35813d4570aa45e101a2b3984079c4ac96 | |
| parent | 14f5732096575f3c4ff0438e6650238370cb465c (diff) | |
| parent | c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b (diff) | |
| download | php-git-cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
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 fc10e3179a..f1dfa5024a 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1563,6 +1563,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); |