[Scummvm-cvs-logs] scummvm master -> edeedc3cc57b2d0fee8431a6b6f27b1b308bb2b7

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
edeedc3cc5 WINTERMUTE: Fix leak


Commit: edeedc3cc57b2d0fee8431a6b6f27b1b308bb2b7
    https://github.com/scummvm/scummvm/commit/edeedc3cc57b2d0fee8431a6b6f27b1b308bb2b7
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-09-24T10:25:31-07:00

Commit Message:
WINTERMUTE: Fix leak

Changed paths:
    engines/wintermute/base/file/base_disk_file.cpp



diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 2d3951b..25be3da 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -178,10 +178,8 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 			}
 
 			delete[] compBuffer;
-
-			return new Common::MemoryReadStream(data, uncompSize, DisposeAfterUse::YES);
 			delete file;
-			file = NULL;
+			return new Common::MemoryReadStream(data, uncompSize, DisposeAfterUse::YES);
 		} else {
 			file->seek(0, SEEK_SET);
 			return file;