From: Wez Furlong <wez@php.net>
Date: Mon, 18 Mar 2002 19:42:19 +0000 (+0000)
Subject: Fix for bugs #16148, #11199, #10092:
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~1259
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48e902bacd1979416b91abbea32e5f783213c966;p=php

Fix for bugs #16148, #11199, #10092:
fread from socket will never free memory.
This patch should also be applied to php_sockread_internal in
fsock.c in the 4.2 branch.
---

diff --git a/main/network.c b/main/network.c
index e5bbbca57b..d8a69ebd67 100644
--- a/main/network.c
+++ b/main/network.c
@@ -633,6 +633,14 @@ static size_t php_sock_stream_read_internal(php_stream *stream, php_netstream_da
 #endif
 	nr_bytes = recv(sock->socket, buf, sock->chunk_size, 0);
 	if(nr_bytes > 0) {
+
+		/* try to avoid ever expanding buffer */
+		if (sock->readpos > 0) {
+			memmove(sock->readbuf, READPTR(sock), sock->readbuflen - sock->readpos);
+			sock->writepos -= sock->readpos;
+			sock->readpos = 0;
+		}
+		
 		if(sock->writepos + nr_bytes > sock->readbuflen) {
 			sock->readbuflen += sock->chunk_size;
 			sock->readbuf = perealloc(sock->readbuf, sock->readbuflen,