From: Sterling Hughes <sterling@php.net>
Date: Mon, 11 Sep 2000 03:33:14 +0000 (+0000)
Subject: @- Fix bug with curl places extra data in the output. (medvitz@medvitz.net)
X-Git-Tag: php-4.0.3RC1~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d44d114b758e30bc109011dab2f93d8698ba2b52;p=php

@- Fix bug with curl places extra data in the output. (medvitz@medvitz.net)
---

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index ff9c0bc2c7..3575445b11 100644
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -348,6 +348,7 @@ PHP_FUNCTION(curl_exec)
 	FILE *fp;
 	char buf[4096];
 	int b;
+	unsigned long pos = 0;
 
 	CURLLS_FETCH();
 	
@@ -408,8 +409,10 @@ PHP_FUNCTION(curl_exec)
 		ret_data = emalloc((stat_sb.st_size+1)*sizeof(char));
 		
 		while ((b = fread(buf, 1, sizeof(buf), fp)) > 0) {
-			strcat(ret_data, buf);
+			memcpy(&(ret_data[pos]), buf, b);
+			pos += b;
 		}
+		ret_data[stat_sb.st_size - 1] = '\0';
 		
 		RETURN_STRINGL(ret_data, stat_sb.st_size, 0);