diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-26 22:56:27 -0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-26 22:56:27 -0800 |
| commit | 8a6f90543f07599b3bd629cf78b39c3b68c31814 (patch) | |
| tree | f86543f4af7fe6e518d1e715db963d0c0e1b19aa /ext | |
| parent | 4d7dd7a95fe346e3ebd336119f3f2bbd148a0d97 (diff) | |
| parent | 2453a48ab56f25c0900a5baa917cedc88db8e3e1 (diff) | |
| download | php-git-8a6f90543f07599b3bd629cf78b39c3b68c31814.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext')
| -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 5f71ba657d..e1d0b54c20 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2019,6 +2019,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ CURLcode error = CURLE_OK; zend_long lval; + ZVAL_DEREF(zvalue); switch (option) { /* Long options */ case CURLOPT_SSL_VERIFYHOST: @@ -2464,6 +2465,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ } ZEND_HASH_FOREACH_VAL(ph, current) { + ZVAL_DEREF(current); val = zval_get_string(current); slist = curl_slist_append(slist, ZSTR_VAL(val)); zend_string_release(val); @@ -2531,6 +2533,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ zend_string_addref(string_key); } + ZVAL_DEREF(current); if (Z_TYPE_P(current) == IS_OBJECT && instanceof_function(Z_OBJCE_P(current), curl_CURLFile_class)) { /* new-style file upload */ |