com php-src: fix backport mistake: ext/openssl/openssl.c
| From: | Anatol Belski | Date: | Fri, 03 Jul 2015 14:21:02 +0000 |
| Subject: | com php-src: fix backport mistake: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87732@lists.php.net to get a copy of this message | ||
Commit: b2812119792c5524fa6224275a012dcf0bfdb2e3
Author: Anatol Belski <ab@php.net> Fri, 3 Jul 2015 16:21:02 +0200
Parents: 344ff5dd4c538eaebea075f7705321f8b86d0b47
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b2812119792c5524fa6224275a012dcf0bfdb2e3
Log:
fix backport mistake
in 5.6 it has to be explicitly copied to avoid double free
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index ae3b2e2..58ca098 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -1645,7 +1645,7 @@ PHP_FUNCTION(openssl_spki_export)
BUF_MEM *bio_buf;
BIO_get_mem_ptr(out, &bio_buf);
- RETVAL_STRINGL((char *)bio_buf->data, bio_buf->length, 0);
+ RETVAL_STRINGL((char *)bio_buf->data, bio_buf->length, 1);
}
goto cleanup;