From 3fa89b4e9fb9579b2b77927997dbc41c4cc876e8 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sun, 27 Apr 2014 10:18:50 +0300
Subject: [PATCH] Fixed crash on attempt to load corrupted data file

Instance of FileReader is no longer destructed when header of data file is valid but complete loading of file fails
Loading of truncated .zip file is the simplest test case
---
 src/resourcefiles/file_7z.cpp  | 2 ++
 src/resourcefiles/file_grp.cpp | 2 ++
 src/resourcefiles/file_pak.cpp | 2 ++
 src/resourcefiles/file_rff.cpp | 2 ++
 src/resourcefiles/file_wad.cpp | 2 ++
 src/resourcefiles/file_zip.cpp | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/src/resourcefiles/file_7z.cpp b/src/resourcefiles/file_7z.cpp
index 8b1c23b67f..5c92892426 100644
--- a/src/resourcefiles/file_7z.cpp
+++ b/src/resourcefiles/file_7z.cpp
@@ -351,6 +351,8 @@ FResourceFile *Check7Z(const char *filename, FileReader *file, bool quiet)
 		{
 			FResourceFile *rf = new F7ZFile(filename, file);
 			if (rf->Open(quiet)) return rf;
+
+			rf->Reader = NULL; // to avoid destruction of reader
 			delete rf;
 		}
 	}
diff --git a/src/resourcefiles/file_grp.cpp b/src/resourcefiles/file_grp.cpp
index dc4c978124..63738d7e60 100644
--- a/src/resourcefiles/file_grp.cpp
+++ b/src/resourcefiles/file_grp.cpp
@@ -147,6 +147,8 @@ FResourceFile *CheckGRP(const char *filename, FileReader *file, bool quiet)
 		{
 			FResourceFile *rf = new FGrpFile(filename, file);
 			if (rf->Open(quiet)) return rf;
+
+			rf->Reader = NULL; // to avoid destruction of reader
 			delete rf;
 		}
 	}
diff --git a/src/resourcefiles/file_pak.cpp b/src/resourcefiles/file_pak.cpp
index 099e8046c8..9ea01767b1 100644
--- a/src/resourcefiles/file_pak.cpp
+++ b/src/resourcefiles/file_pak.cpp
@@ -139,6 +139,8 @@ FResourceFile *CheckPak(const char *filename, FileReader *file, bool quiet)
 		{
 			FResourceFile *rf = new FPakFile(filename, file);
 			if (rf->Open(quiet)) return rf;
+
+			rf->Reader = NULL; // to avoid destruction of reader
 			delete rf;
 		}
 	}
diff --git a/src/resourcefiles/file_rff.cpp b/src/resourcefiles/file_rff.cpp
index 2e6a3bc5a2..682df985d0 100644
--- a/src/resourcefiles/file_rff.cpp
+++ b/src/resourcefiles/file_rff.cpp
@@ -260,6 +260,8 @@ FResourceFile *CheckRFF(const char *filename, FileReader *file, bool quiet)
 		{
 			FResourceFile *rf = new FRFFFile(filename, file);
 			if (rf->Open(quiet)) return rf;
+
+			rf->Reader = NULL; // to avoid destruction of reader
 			delete rf;
 		}
 	}
diff --git a/src/resourcefiles/file_wad.cpp b/src/resourcefiles/file_wad.cpp
index ea8cac15b6..384290782f 100644
--- a/src/resourcefiles/file_wad.cpp
+++ b/src/resourcefiles/file_wad.cpp
@@ -651,6 +651,8 @@ FResourceFile *CheckWad(const char *filename, FileReader *file, bool quiet)
 		{
 			FResourceFile *rf = new FWadFile(filename, file);
 			if (rf->Open(quiet)) return rf;
+
+			rf->Reader = NULL; // to avoid destruction of reader
 			delete rf;
 		}
 	}
diff --git a/src/resourcefiles/file_zip.cpp b/src/resourcefiles/file_zip.cpp
index 101b519823..7ae0e90a58 100644
--- a/src/resourcefiles/file_zip.cpp
+++ b/src/resourcefiles/file_zip.cpp
@@ -423,6 +423,8 @@ FResourceFile *CheckZip(const char *filename, FileReader *file, bool quiet)
 		{
 			FResourceFile *rf = new FZipFile(filename, file);
 			if (rf->Open(quiet)) return rf;
+
+			rf->Reader = NULL; // to avoid destruction of reader
 			delete rf;
 		}
 	}