Merge branch 'PHP-7.4'

nikic · nikic · commit 8578c54e142e · 2019-02-08T10:50:07.000+01:00
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,9 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent)`
`100`	`100`	`if (errstr) {`
`101`	`101`	`if (zerrstr) {`
`102`	`102`	`ZEND_TRY_ASSIGN_STR(zerrstr, errstr);`
	`103`	`+ } else {`
	`104`	`+ zend_string_release(errstr);`
`103`	`105`	`}`
`104`		`- zend_string_release(errstr);`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`RETURN_FALSE;`