Merge remote branch 'upstream/master' into pegasus

Conflicts:
	video/qt_decoder.cpp

1 files changed, 6 insertions, 4 deletions

diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp
index fd822f56b6..7f9ca70080 100644
--- a/engines/scumm/smush/channel.cpp
+++ b/engines/scumm/smush/channel.cpp
@@ -99,11 +99,13 @@ void SmushChannel::processBuffer() {
 				byte *old = _tbuffer;
 				int32 new_size = _tbufferSize - offset;
 				_tbuffer = (byte *)malloc(new_size);
-				// FIXME: _tbuffer might be 0 if new_size is 0.
 				// NB: Also check other "if (_tbuffer)" locations in smush
-				if (!_tbuffer)
-					error("smush channel failed to allocate memory");
-				memcpy(_tbuffer, old + offset, new_size);
+				if (!_tbuffer) {
+					if (new_size)
+						error("smush channel failed to allocate memory");
+				} else {
+					memcpy(_tbuffer, old + offset, new_size);
+				}
 				_tbufferSize = new_size;
 				free(old);
 			}