From afa735cec4491c5986c459e889e17fcea94853a5 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 28 Nov 2013 14:19:33 -0500
Subject: FULLPIPE: Fix crash at scene03 load

---
 engines/fullpipe/utils.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'engines/fullpipe/utils.cpp')

diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 3304a93667..3c2aaebd83 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -149,6 +149,11 @@ bool MemoryObject::load(MfcArchive &file) {
 void MemoryObject::loadFile(char *filename) {
 	debug(5, "MemoryObject::loadFile(<%s>)", filename);
 	if (!_data) {
+		NGIArchive *arr = g_fullpipe->_currArchive;
+
+		if (g_fullpipe->_currArchive != _libHandle && _libHandle)
+			g_fullpipe->_currArchive = _libHandle;
+
 		Common::SeekableReadStream *s = g_fullpipe->_currArchive->createReadStreamForMember(filename);
 
 		if (s) {
@@ -161,7 +166,11 @@ void MemoryObject::loadFile(char *filename) {
 			s->read(_data, _dataSize);
 
 			delete s;
+		} else {
+			warning("MemoryObject::loadFile(): reading failure");
 		}
+
+		g_fullpipe->_currArchive = arr;
 	}
 }
 
@@ -181,6 +190,8 @@ byte *MemoryObject::loadData() {
 }
 
 void MemoryObject::freeData() {
+	debug(8, "MemoryObject::freeData(): file: %s", _memfilename);
+
 	if (_data)
 		free(_data);
 
-- 
cgit v1.2.3


From a742b5fe8c6f09dd017c645c65d4cdff35f47202 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 28 Nov 2013 14:44:43 -0500
Subject: FULLPIPE: Skip reading empty filenames

---
 engines/fullpipe/utils.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'engines/fullpipe/utils.cpp')

diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 3c2aaebd83..3a65801951 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -148,6 +148,10 @@ bool MemoryObject::load(MfcArchive &file) {
 
 void MemoryObject::loadFile(char *filename) {
 	debug(5, "MemoryObject::loadFile(<%s>)", filename);
+
+	if (!*filename)
+		return;
+
 	if (!_data) {
 		NGIArchive *arr = g_fullpipe->_currArchive;
 
-- 
cgit v1.2.3