Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit db055fdb8906 · 2021-08-31T17:24:30.000+02:00
* PHP-7.4:
  Avoid dangling pointer in curl header.str
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -1638,9 +1638,7 @@ static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, v
 		if (ch->header.str) {
 			zend_string_release_ex(ch->header.str, 0);
 		}
-		if (buf_len > 0) {
-			ch->header.str = zend_string_init(buf, buf_len, 0);
-		}
+		ch->header.str = zend_string_init(buf, buf_len, 0);
 	}
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -1638,9 +1638,7 @@ static int curl_debug(CURL cp, curl_infotype type, char buf, size_t buf_len, v`
`1638`	`1638`	`if (ch->header.str) {`
`1639`	`1639`	`zend_string_release_ex(ch->header.str, 0);`
`1640`	`1640`	`}`
`1641`		`- if (buf_len > 0) {`
`1642`		`- ch->header.str = zend_string_init(buf, buf_len, 0);`
`1643`		`- }`
	`1641`	`+ ch->header.str = zend_string_init(buf, buf_len, 0);`
`1644`	`1642`	`}`
`1645`	`1643`
`1646`	`1644`	`return 0;`