diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-06-16 17:14:23 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-06-16 17:14:23 +0100 |
| commit | c2a348b5bca3826342e0833bb9a4ba4301dfbb4d (patch) | |
| tree | 838d842301fb284e23f2daa20eb5f1e85e42a40c | |
| parent | 84b9b164a80fe4f9ec10e729a0d2386cc75254dd (diff) | |
| parent | f19dfac830a728f4d77e7e4d1aae3eb05c9496ac (diff) | |
| download | php-git-c2a348b5bca3826342e0833bb9a4ba4301dfbb4d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | ext/openssl/openssl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 8418e4030c..47bafaf660 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1860,21 +1860,19 @@ PHP_FUNCTION(openssl_spki_new) s = zend_string_alloc(strlen(spkac) + strlen(spkstr), 0); sprintf(ZSTR_VAL(s), "%s%s", spkac, spkstr); ZSTR_LEN(s) = strlen(ZSTR_VAL(s)); + OPENSSL_free(spkstr); RETVAL_STR(s); goto cleanup; cleanup: - if (keyresource == NULL && spki != NULL) { + if (spki != NULL) { NETSCAPE_SPKI_free(spki); } if (keyresource == NULL && pkey != NULL) { EVP_PKEY_free(pkey); } - if (keyresource == NULL && spkstr != NULL) { - efree(spkstr); - } if (s && ZSTR_LEN(s) <= 0) { RETVAL_FALSE; |