Merge branch 'PHP-7.4' into master

cmb69 · cmb69 · commit 4591cb8a07ea · 2020-09-21T11:27:51.000+02:00
* PHP-7.4:
  Fix memory leak in php_imap_mutf7()
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -2570,7 +2570,8 @@ static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 	if (out == NIL) {
 		RETURN_FALSE;
 	} else {
-		RETURN_STRING((char *)out);
+		RETVAL_STRING((char *)out);
+		fs_give((void**) &out);
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -2570,7 +2570,8 @@ static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */`
`2570`	`2570`	`if (out == NIL) {`
`2571`	`2571`	`RETURN_FALSE;`
`2572`	`2572`	`} else {`
`2573`		`- RETURN_STRING((char *)out);`
	`2573`	`+ RETVAL_STRING((char *)out);`
	`2574`	`+ fs_give((void**) &out);`
`2574`	`2575`	`}`
`2575`	`2576`	`}`
`2576`	`2577`	`/* }}} */`