Add missing derefs in CurlFile

nikic · nikic · commit 54fa0a69f8c5 · 2021-02-02T10:31:16.000+01:00
As pointed out on GH-6456.
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -2207,6 +2207,7 @@ static inline int build_mime_structure_from_hash(php_curl *ch, zval *zpostfields
 #endif
 
 			prop = zend_read_property(curl_CURLFile_class, 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 {
@@ -2217,10 +2218,12 @@ static inline int build_mime_structure_from_hash(php_curl *ch, zval *zpostfields
 				}
 
 				prop = zend_read_property(curl_CURLFile_class, 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, 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
`@@ -2207,6 +2207,7 @@ static inline int build_mime_structure_from_hash(php_curl ch, zval zpostfields`
`2207`	`2207`	`#endif`
`2208`	`2208`
`2209`	`2209`	`prop = zend_read_property(curl_CURLFile_class, current, "name", sizeof("name")-1, 0, &rv);`
	`2210`	`+ ZVAL_DEREF(prop);`
`2210`	`2211`	`if (Z_TYPE_P(prop) != IS_STRING) {`
`2211`	`2212`	`php_error_docref(NULL, E_WARNING, "Invalid filename for key %s", ZSTR_VAL(string_key));`
`2212`	`2213`	`} else {`
`@@ -2217,10 +2218,12 @@ static inline int build_mime_structure_from_hash(php_curl ch, zval zpostfields`
`2217`	`2218`	`}`
`2218`	`2219`
`2219`	`2220`	`prop = zend_read_property(curl_CURLFile_class, current, "mime", sizeof("mime")-1, 0, &rv);`
	`2221`	`+ ZVAL_DEREF(prop);`
`2220`	`2222`	`if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {`
`2221`	`2223`	`type = Z_STRVAL_P(prop);`
`2222`	`2224`	`}`
`2223`	`2225`	`prop = zend_read_property(curl_CURLFile_class, current, "postname", sizeof("postname")-1, 0, &rv);`
	`2226`	`+ ZVAL_DEREF(prop);`
`2224`	`2227`	`if (Z_TYPE_P(prop) == IS_STRING && Z_STRLEN_P(prop) > 0) {`
`2225`	`2228`	`filename = Z_STRVAL_P(prop);`
`2226`	`2229`	`}`