From c79b6afcad0f463e7e1ab4ebe50e36f65abd8e16 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Thu, 10 Nov 2011 23:44:00 +0100
Subject: CRUISE: Fix OOM checks

---
 engines/cruise/overlay.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines/cruise/overlay.cpp')

diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp
index 2f4b375865..d618ab5599 100644
--- a/engines/cruise/overlay.cpp
+++ b/engines/cruise/overlay.cpp
@@ -185,11 +185,10 @@ int loadOverlay(const char *scriptName) {
 
 	// This memory block will be later passed to a MemoryReadStream, which will dispose of it
 	unpackedBuffer = (byte *)malloc(unpackedSize);
-	memset(unpackedBuffer, 0, unpackedSize);
-
 	if (!unpackedBuffer) {
 		return (-2);
 	}
+	memset(unpackedBuffer, 0, unpackedSize);
 
 	if (volumePtrToFileDescriptor[fileIdx].size + 2 != unpackedSize) {
 		char *pakedBuffer =
@@ -566,11 +565,10 @@ int loadOverlay(const char *scriptName) {
 
 		// This memory block will be later passed to a MemoryReadStream, which will dispose of it
 		unpackedBuffer = (byte *)malloc(unpackedSize);
-		memset(unpackedBuffer, 0, unpackedSize);
-
 		if (!unpackedBuffer) {
 			return (-2);
 		}
+		memset(unpackedBuffer, 0, unpackedSize);
 
 		if (volumePtrToFileDescriptor[fileIdx].size + 2 !=
 		        unpackedSize) {
-- 
cgit v1.2.3