summaryrefslogtreecommitdiff
path: root/ext/curl
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-02-23 20:50:17 +0000
committerAntony Dovgal <tony2001@php.net>2007-02-23 20:50:17 +0000
commitb4f2b5d1df3ebcc913a80a4edb513b713be084b7 (patch)
tree1bff4683110cc681dcdc77537ed8bc125083bc65 /ext/curl
parent72c8da0695cf8282458eec08a50bf170124d05ad (diff)
downloadphp-git-b4f2b5d1df3ebcc913a80a4edb513b713be084b7.tar.gz
fix leak
no need to allocate the buffer if there was no data
Diffstat (limited to 'ext/curl')
-rw-r--r--ext/curl/interface.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index dfeebe43e0..faba70a1dd 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -713,7 +713,9 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
case PHP_CURL_FILE:
return fwrite(data, size, nmemb, t->fp);
case PHP_CURL_RETURN:
- smart_str_appendl(&t->buf, data, (int) length);
+ if (length > 0) {
+ smart_str_appendl(&t->buf, data, (int) length);
+ }
break;
case PHP_CURL_USER: {
zval **argv[2];
@@ -852,7 +854,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
case PHP_CURL_STDOUT:
/* Handle special case write when we're returning the entire transfer
*/
- if (ch->handlers->write->method == PHP_CURL_RETURN) {
+ if (ch->handlers->write->method == PHP_CURL_RETURN && length > 0) {
smart_str_appendl(&ch->handlers->write->buf, data, (int) length);
} else {
PHPWRITE(data, length);