From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 1 Nov 2017 23:34:11 +0000 (+0200)
Subject: lib: i_stream_w_buffer_realloc() - avoid passing NULL to memcpy()
X-Git-Tag: 2.3.0.rc1~602
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5aa1aa87a24ff39d566a3ad90d0f8d054118cfe7;p=thirdparty%2Fdovecot%2Fcore.git

lib: i_stream_w_buffer_realloc() - avoid passing NULL to memcpy()

It happened only with size=0, so it shouldn't have mattered much.
---

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 230542d00a..2896110a1e 100644
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -782,7 +782,10 @@ i_stream_w_buffer_realloc(struct istream_private *stream, size_t old_size)
 				       stream->buffer_size);
 	} else {
 		new_buffer = i_malloc(stream->buffer_size);
-		memcpy(new_buffer, stream->w_buffer, old_size);
+		if (old_size > 0) {
+			i_assert(stream->w_buffer != NULL);
+			memcpy(new_buffer, stream->w_buffer, old_size);
+		}
 		if (stream->memarea != NULL)
 			memarea_unref(&stream->memarea);
 	}