com php-src: Fix invalid free: ext/standard/fsock.c
| From: | Nikita Popov | Date: | Fri, 08 Feb 2019 09:49:54 +0000 |
| Subject: | com php-src: Fix invalid free: ext/standard/fsock.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104479@lists.php.net to get a copy of this message | ||
Commit: fa123b51ccd173224fb033ddcf148e8a97138127
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 8 Feb 2019 10:49:54 +0100
Parents: cf7406b1f464d8b30bc7e059fd4fa6417bf5a9e0
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa123b51ccd173224fb033ddcf148e8a97138127
Log:
Fix invalid free
Changed paths:
M ext/standard/fsock.c
Diff:
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index aecca52..f896c70 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -100,8 +100,9 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)
if (errstr) {
if (zerrstr) {
ZEND_TRY_ASSIGN_STR(zerrstr, errstr);
+ } else {
+ zend_string_release(errstr);
}
- zend_string_release(errstr);
}
RETURN_FALSE;