with unicode buffers, positions are in uchars

diff --git a/main/streams/streams.c b/main/streams/streams.c
index 91c7a6a960bd293232c7afc1f68913ad74e82767..e917d38952c8ca173ca80e6da1b1e411abadef6d 100755 (executable)
--- 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);