Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit bc214c8423a7 · 2020-10-15T13:19:30.000+02:00
* PHP-7.3:
  Fix broken fix for #80239
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -2321,7 +2321,6 @@ PHP_FUNCTION(imap_subscribe)
 	} else {
 		RETURN_FALSE;
 	}
-	mail_free_address(&addr);
 }
 /* }}} */
 
@@ -2711,8 +2710,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
`@@ -2321,7 +2321,6 @@ PHP_FUNCTION(imap_subscribe)`
`2321`	`2321`	`} else {`
`2322`	`2322`	`RETURN_FALSE;`
`2323`	`2323`	`}`
`2324`		`- mail_free_address(&addr);`
`2325`	`2324`	`}`
`2326`	`2325`	`/* }}} */`
`2327`	`2326`
`@@ -2711,8 +2710,9 @@ PHP_FUNCTION(imap_rfc822_write_address)`
`2711`	`2710`	`if (string) {`
`2712`	`2711`	`RETVAL_STR(string);`
`2713`	`2712`	`} else {`
`2714`		`- RETURN_FALSE;`
	`2713`	`+ RETVAL_FALSE;`
`2715`	`2714`	`}`
	`2715`	`+ mail_free_address(&addr);`
`2716`	`2716`	`}`
`2717`	`2717`	`/* }}} */`
`2718`	`2718`