Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit 0ec7bfaa43e8 · 2021-02-02T10:32:11.000+01:00
* PHP-7.4:
  Add missing derefs in CurlFile
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -2046,6 +2046,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 {
@@ -2056,10 +2057,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
`@@ -2046,6 +2046,7 @@ static inline int build_mime_structure_from_hash(php_curl ch, zval zpostfields`
`2046`	`2046`	`#endif`
`2047`	`2047`
`2048`	`2048`	`prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "name", sizeof("name")-1, 0, &rv);`
	`2049`	`+ ZVAL_DEREF(prop);`
`2049`	`2050`	`if (Z_TYPE_P(prop) != IS_STRING) {`
`2050`	`2051`	`php_error_docref(NULL, E_WARNING, "Invalid filename for key %s", ZSTR_VAL(string_key));`
`2051`	`2052`	`} else {`
`@@ -2056,10 +2057,12 @@ static inline int build_mime_structure_from_hash(php_curl ch, zval zpostfields`
`2056`	`2057`	`}`
`2057`	`2058`
`2058`	`2059`	`prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);`
	`2060`	`+ ZVAL_DEREF(prop);`
`2059`	`2061`	`if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {`
`2060`	`2062`	`type = Z_STRVAL_P(prop);`
`2061`	`2063`	`}`
`2062`	`2064`	`prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);`
	`2065`	`+ ZVAL_DEREF(prop);`
`2063`	`2066`	`if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {`
`2064`	`2067`	`filename = Z_STRVAL_P(prop);`
`2065`	`2068`	`}`