diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-02-17 13:29:34 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-02-17 13:29:34 -0800 |
| commit | 0841eca580d7914eaadeb4270d48f72c5c42ba2c (patch) | |
| tree | 60735efec89d6004d11aded5f2038a2c5b2a124e /ext/openssl/openssl.c | |
| parent | 432d59ab5560202a46b01d05455418e9fc810365 (diff) | |
| parent | 7b0107cc5d3d90655957680ef9cf916dce6875a7 (diff) | |
| download | php-git-0841eca580d7914eaadeb4270d48f72c5c42ba2c.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index fd8d7deb62..c939c01b2b 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3214,6 +3214,7 @@ PHP_FUNCTION(openssl_pkey_get_public) if (pkey == NULL) { RETURN_FALSE; } + zend_list_addref(Z_LVAL_P(return_value)); } /* }}} */ @@ -3250,6 +3251,7 @@ PHP_FUNCTION(openssl_pkey_get_private) if (pkey == NULL) { RETURN_FALSE; } + zend_list_addref(Z_LVAL_P(return_value)); } /* }}} */ |