archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

leave length as -1, no need to strdup()

Browse source
This commit is contained in:
Sterling Hughes 2004-03-12 16:36:30 +00:00
parent 1c7ea2045b
commit ad84ce6233
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/curl/interface.c
View file

@ -467,7 +467,6 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
zval *zfd = NULL; zval *zfd = NULL;
zval *zlength = NULL; zval *zlength = NULL;
zval *retval_ptr; zval *retval_ptr;
int length;
int error; int error;
zend_fcall_info fci; zend_fcall_info fci;
TSRMLS_FETCH_FROM_CTX(ch->thread_ctx); TSRMLS_FETCH_FROM_CTX(ch->thread_ctx);
@ -499,13 +498,10 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC); error = zend_call_function(&fci, &t->fci_cache TSRMLS_CC);
if (error == FAILURE) { if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_READFUNCTION"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_READFUNCTION");
length = -1;
} else { } else {
if(Z_TYPE_P(retval_ptr) == IS_STRING) { if (Z_TYPE_P(retval_ptr) == IS_STRING) {
memcpy(data, Z_STRVAL_P(retval_ptr), size * nmemb); memcpy(data, Z_STRVAL_P(retval_ptr), size * nmemb);
length = Z_STRLEN_P(retval_ptr); length = Z_STRLEN_P(retval_ptr);
} else {
data = strdup("");
} }
} }