diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-02 10:32:11 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-02-02 10:32:11 +0100 |
| commit | 0ec7bfaa43e8eaf23a35b2850e0b9085b380dd1f (patch) | |
| tree | 22defdd57e990f4daebc58fd8ace293ca2929630 | |
| parent | f1a988af4b3d20e2c6536c8a0fd51af824b9df59 (diff) | |
| parent | 54fa0a69f8c5e9a97c46e74c6bf7bab1b2b02465 (diff) | |
| download | php-git-0ec7bfaa43e8eaf23a35b2850e0b9085b380dd1f.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Add missing derefs in CurlFile
| -rw-r--r-- | ext/curl/interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 82d97053ee..2fd6ec1454 100644 --- 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); } |