Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit d1feeed7f33b · 2020-09-21T11:26:41.000+02:00
* PHP-7.3:
  Fix memory leak in php_imap_mutf7()
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -3086,7 +3086,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
`@@ -3086,7 +3086,8 @@ static void php_imap_mutf7(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */`
`3086`	`3086`	`if (out == NIL) {`
`3087`	`3087`	`RETURN_FALSE;`
`3088`	`3088`	`} else {`
`3089`		`- RETURN_STRING((char *)out);`
	`3089`	`+ RETVAL_STRING((char *)out);`
	`3090`	`+ fs_give((void**) &out);`
`3090`	`3091`	`}`
`3091`	`3092`	`}`
`3092`	`3093`	`/* }}} */`