clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use zend_long_to_str in curl

Browse Source 
Also use STR_ADDREF instead of maintaining a numeric_key flag.
This commit is contained in:
Nikita Popov 2014-05-28 18:34:35 +02:00
parent 0987d19712
commit 3f27d707d2
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ext/curl/interface.c
View File

@ -2473,15 +2473,12 @@ static int _php_curl_setopt(php_curl *ch, long option, zval *zvalue TSRMLS_DC) /
}
ZEND_HASH_FOREACH_KEY_VAL(postfields, num_key, string_key, current) {
char *postval;
int numeric_key;
char *postval;
/* Pretend we have a string_key here */
if (!string_key) {
string_key = STR_ALLOC(MAX_LENGTH_OF_LONG, 0);
string_key->len = snprintf(string_key->val, string_key->len, "%ld", num_key);
numeric_key = 1;
string_key = zend_long_to_str(num_key);
} else {
numeric_key = 0;
STR_ADDREF(string_key);
}
if (Z_TYPE_P(current) == IS_OBJECT &&
@ -2517,9 +2514,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval *zvalue TSRMLS_DC) /
CURLFORM_END);
}
if (numeric_key) {
STR_RELEASE(string_key);
}
STR_RELEASE(string_key);
continue;
}
@ -2569,10 +2564,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval *zvalue TSRMLS_DC) /
CURLFORM_END);
}
if (numeric_key) {
STR_RELEASE(string_key);
}
STR_RELEASE(string_key);
} ZEND_HASH_FOREACH_END();
SAVE_CURL_ERROR(ch, error);