Fix broken fix for #80239

cmb69 · cmb69 · commit 4b9db65f6889 · 2020-10-15T13:18:34.000+02:00
No idea why that `git am` failed that badly.
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
@@ -2305,7 +2305,6 @@ PHP_FUNCTION(imap_subscribe)
 	} else {
 		RETURN_FALSE;
 	}
-	mail_free_address(&addr);
 }
 /* }}} */
 
@@ -2693,8 +2692,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
`@@ -2305,7 +2305,6 @@ PHP_FUNCTION(imap_subscribe)`
`2305`	`2305`	`} else {`
`2306`	`2306`	`RETURN_FALSE;`
`2307`	`2307`	`}`
`2308`		`- mail_free_address(&addr);`
`2309`	`2308`	`}`
`2310`	`2309`	`/* }}} */`
`2311`	`2310`
`@@ -2693,8 +2692,9 @@ PHP_FUNCTION(imap_rfc822_write_address)`
`2693`	`2692`	`if (string) {`
`2694`	`2693`	`RETVAL_STR(string);`
`2695`	`2694`	`} else {`
`2696`		`- RETURN_FALSE;`
	`2695`	`+ RETVAL_FALSE;`
`2697`	`2696`	`}`
	`2697`	`+ mail_free_address(&addr);`
`2698`	`2698`	`}`
`2699`	`2699`	`/* }}} */`
`2700`	`2700`