diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-19 01:04:19 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-19 01:04:19 -0700 |
| commit | 8e0f1100990c5a2e9ccc91e76ae884cbbdf24356 (patch) | |
| tree | 22666688169f9f20a473e3e28da1fe4df2a13c0e /ext/openssl/openssl.c | |
| parent | bcf785fb6667194ff70ef6f903189a495c15eb40 (diff) | |
| parent | cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4 (diff) | |
| download | php-git-8e0f1100990c5a2e9ccc91e76ae884cbbdf24356.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix using wrong buffer pointer
Diffstat (limited to 'ext/openssl/openssl.c')
| -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 578b8d43f9..353c358199 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1576,6 +1576,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); |