Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit ecd51aa09985 · 2020-10-15T13:20:58.000+02:00
* PHP-7.4:
  Fix broken fix for #80239
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -1849,7 +1849,6 @@ PHP_FUNCTION(imap_subscribe)
 	} else {
 		RETURN_FALSE;
 	}
-	mail_free_address(&addr);
 }
 /* }}} */
 
@@ -2251,8 +2250,9 @@ PHP_FUNCTION(imap_rfc822_write_address)
 	if (string) {
 		RETVAL_STR(string);
 	} else {
-		RETURN_FALSE;
+		RETVAL_FALSE;
 	}
+	mail_free_address(&addr);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -1849,7 +1849,6 @@ PHP_FUNCTION(imap_subscribe)`
`1849`	`1849`	`} else {`
`1850`	`1850`	`RETURN_FALSE;`
`1851`	`1851`	`}`
`1852`		`- mail_free_address(&addr);`
`1853`	`1852`	`}`
`1854`	`1853`	`/* }}} */`
`1855`	`1854`
`@@ -2251,8 +2250,9 @@ PHP_FUNCTION(imap_rfc822_write_address)`
`2251`	`2250`	`if (string) {`
`2252`	`2251`	`RETVAL_STR(string);`
`2253`	`2252`	`} else {`
`2254`		`- RETURN_FALSE;`
	`2253`	`+ RETVAL_FALSE;`
`2255`	`2254`	`}`
	`2255`	`+ mail_free_address(&addr);`
`2256`	`2256`	`}`
`2257`	`2257`	`/* }}} */`
`2258`	`2258`