diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-10-30 16:42:23 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-10-30 16:42:23 +0000 |
| commit | 7c2031bfca3a4c006fbdbd863373dcebc360c7cd (patch) | |
| tree | 6a3c0c6a487ee72d44cc15282153d5b4797d971c /ext/openssl/openssl.c | |
| parent | 37b0ad5537e7ccbdce6d81afa402c01885db79f1 (diff) | |
| parent | fc169d2133a0507addbfd4f3b0cafe224b6e2c38 (diff) | |
| download | php-git-7c2031bfca3a4c006fbdbd863373dcebc360c7cd.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 172e5b0924..ff79824ee3 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1662,10 +1662,11 @@ static X509 * php_openssl_x509_from_zval(zval * val, int makeresource, zend_reso if (!what) { return NULL; } - /* this is so callers can decide if they should free the X509 */ if (resourceval) { *resourceval = res; - Z_ADDREF_P(val); + if (makeresource) { + Z_ADDREF_P(val); + } } return (X509*)what; } @@ -3201,7 +3202,9 @@ static X509_REQ * php_openssl_csr_from_zval(zval * val, int makeresource, zend_r if (what) { if (resourceval) { *resourceval = res; - Z_ADDREF_P(val); + if (makeresource) { + Z_ADDREF_P(val); + } } return (X509_REQ*)what; } |