Merge pull request #67 from chrisws/initial-bada-port-master

This is the initial implementation of the BADA port.

1 files changed, 9 insertions, 7 deletions

diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp
index 7f71d0549b..f5e0747ba8 100644
--- a/engines/scumm/smush/channel.cpp
+++ b/engines/scumm/smush/channel.cpp
@@ -94,14 +94,16 @@ void SmushChannel::processBuffer() {
 			_tbufferSize = 0;
 		} else {
 			if (offset) {
-				byte *old = _tbuffer;
 				int32 new_size = _tbufferSize - offset;
-				_tbuffer = (byte *)malloc(new_size);
-				if (!_tbuffer)
-					error("smush channel failed to allocate memory");
-				memcpy(_tbuffer, old + offset, new_size);
-				_tbufferSize = new_size;
-				free(old);
+				if (new_size) {
+					byte *old = _tbuffer;
+					_tbuffer = (byte *)malloc(new_size);
+					if (!_tbuffer)
+						error("smush channel failed to allocate memory");
+					memcpy(_tbuffer, old + offset, new_size);
+					_tbufferSize = new_size;
+					free(old);
+				}
 			}
 		}
 	}