Skip to content

Commit f26e77b

Browse files
committed
Avoid memcpy UB in streams
1 parent 8740533 commit f26e77b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

main/streams/streams.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,9 @@ PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size)
586586
stream->readbuf = perealloc(stream->readbuf, stream->readbuflen,
587587
stream->is_persistent);
588588
}
589-
memcpy(stream->readbuf + stream->writepos, bucket->buf, bucket->buflen);
589+
if (bucket->buflen) {
590+
memcpy(stream->readbuf + stream->writepos, bucket->buf, bucket->buflen);
591+
}
590592
stream->writepos += bucket->buflen;
591593

592594
php_stream_bucket_unlink(bucket);

0 commit comments

Comments
 (0)