diff options
| author | Sterling Hughes <sterling@php.net> | 2004-03-12 16:36:30 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2004-03-12 16:36:30 +0000 |
| commit | ad84ce62338dfab52c51cbf47f91e22fb2308cff (patch) | |
| tree | a93692c1be17ce92e7fc43c1af2f105e42d4fe96 | |
| parent | 1c7ea2045bf127ea112950d3c96edc2f6c87e821 (diff) | |
| download | php-git-ad84ce62338dfab52c51cbf47f91e22fb2308cff.tar.gz | |
leave length as -1, no need to strdup()
| -rw-r--r-- | ext/curl/interface.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index ff250b46d6..977f32cc76 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -467,7 +467,6 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) zval *zfd = NULL; zval *zlength = NULL; zval *retval_ptr; - int length; int error; zend_fcall_info fci; 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); if (error == FAILURE) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_READFUNCTION"); - length = -1; } 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); length = Z_STRLEN_P(retval_ptr); - } else { - data = strdup(""); } } |