From: Stanislav Malyshev <stas@php.net>
Date: Sun, 8 Jun 2008 18:21:59 +0000 (+0000)
Subject: with unicode buffers, positions are in uchars
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcd1cd80029e7c410d6190cf0515d5db589e74f8;p=php

with unicode buffers, positions are in uchars
---

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 91c7a6a960..e917d38952 100755
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -509,7 +509,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_D
 							stream->readbuflen += bucket->buflen;
 							stream->readbuf.v = perealloc(stream->readbuf.v, PS_ULEN(stream->readbuf_type == IS_UNICODE, stream->readbuflen), stream->is_persistent);
 						}
-						memcpy(stream->readbuf.s + stream->writepos, bucket->buf.s, PS_ULEN(stream->readbuf_type == IS_UNICODE, bucket->buflen));
+						memcpy(stream->readbuf.s + PS_ULEN(stream->readbuf_type == IS_UNICODE, stream->writepos), bucket->buf.s, PS_ULEN(stream->readbuf_type == IS_UNICODE, bucket->buflen));
 						stream->writepos += bucket->buflen;
 
 						php_stream_bucket_unlink(bucket TSRMLS_CC);