From f26e77b05fe14e580e982c75887314b7fae7b777 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 19 Jun 2019 14:04:54 +0200 Subject: [PATCH] Avoid memcpy UB in streams --- main/streams/streams.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/streams/streams.c b/main/streams/streams.c index f1ff923dee..08b8e62014 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -586,7 +586,9 @@ PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size) stream->readbuf = perealloc(stream->readbuf, stream->readbuflen, stream->is_persistent); } - memcpy(stream->readbuf + stream->writepos, bucket->buf, bucket->buflen); + if (bucket->buflen) { + memcpy(stream->readbuf + stream->writepos, bucket->buf, bucket->buflen); + } stream->writepos += bucket->buflen; php_stream_bucket_unlink(bucket); -- 2.50.1