From 48dd74dd6d2c5514eba475f3612a0a1333342763 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Mon, 22 Aug 2011 10:21:03 +0200
Subject: SCUMM: Revert "Avoid calling malloc with new_size=0"

This reverts commit d6f7e5933657e2e6fcbd1accf9f8a4b77454daec, and
marks the issue with a FIXME. The problem is that it not only skips the malloc,
but also the other code in that block.
---
 engines/scumm/smush/channel.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp
index f5e0747ba8..fd822f56b6 100644
--- a/engines/scumm/smush/channel.cpp
+++ b/engines/scumm/smush/channel.cpp
@@ -60,6 +60,8 @@ void SmushChannel::processBuffer() {
 			if (offset < _tbufferSize) {
 				int 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, _sbuffer + offset, new_size);
@@ -94,16 +96,16 @@ void SmushChannel::processBuffer() {
 			_tbufferSize = 0;
 		} else {
 			if (offset) {
+				byte *old = _tbuffer;
 				int32 new_size = _tbufferSize - offset;
-				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);
-				}
+				_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);
+				_tbufferSize = new_size;
+				free(old);
 			}
 		}
 	}
-- 
cgit v1.2.3