Merge branch 'PHP-8.0'

nikic · nikic · commit 8c00c919e38e · 2021-02-02T10:32:25.000+01:00
* PHP-8.0:
  Add missing derefs in CurlFile
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -2018,6 +2018,7 @@ static inline int build_mime_structure_from_hash(php_curl *ch, zval *zpostfields
 #endif
 
 			prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "name", sizeof("name")-1, 0, &rv);
+			ZVAL_DEREF(prop);
 			if (Z_TYPE_P(prop) != IS_STRING) {
 				php_error_docref(NULL, E_WARNING, "Invalid filename for key %s", ZSTR_VAL(string_key));
 			} else {
@@ -2028,10 +2029,12 @@ static inline int build_mime_structure_from_hash(php_curl *ch, zval *zpostfields
 				}
 
 				prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
+				ZVAL_DEREF(prop);
 				if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {
 					type = Z_STRVAL_P(prop);
 				}
 				prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);
+				ZVAL_DEREF(prop);
 				if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {
 					filename = Z_STRVAL_P(prop);
 				}

Original file line number	Diff line number	Diff line change
`@@ -2018,6 +2018,7 @@ static inline int build_mime_structure_from_hash(php_curl ch, zval zpostfields`
`2018`	`2018`	`#endif`
`2019`	`2019`
`2020`	`2020`	`prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "name", sizeof("name")-1, 0, &rv);`
	`2021`	`+ ZVAL_DEREF(prop);`
`2021`	`2022`	`if (Z_TYPE_P(prop) != IS_STRING) {`
`2022`	`2023`	`php_error_docref(NULL, E_WARNING, "Invalid filename for key %s", ZSTR_VAL(string_key));`
`2023`	`2024`	`} else {`
`@@ -2028,10 +2029,12 @@ static inline int build_mime_structure_from_hash(php_curl ch, zval zpostfields`
`2028`	`2029`	`}`
`2029`	`2030`
`2030`	`2031`	`prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);`
	`2032`	`+ ZVAL_DEREF(prop);`
`2031`	`2033`	`if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {`
`2032`	`2034`	`type = Z_STRVAL_P(prop);`
`2033`	`2035`	`}`
`2034`	`2036`	`prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);`
	`2037`	`+ ZVAL_DEREF(prop);`
`2035`	`2038`	`if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {`
`2036`	`2039`	`filename = Z_STRVAL_P(prop);`
`2037`	`2040`	`}`