From 8b92c45f8478fa61b06fdf733f72beabdf8f26b4 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 4 Apr 2015 12:38:37 +0300 Subject: [PATCH 1/2] Fixed crash in lump filtering caused by uninitialized variables --- src/resourcefiles/resourcefile.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/resourcefiles/resourcefile.cpp b/src/resourcefiles/resourcefile.cpp index 64fe9b6cf..223ad861e 100644 --- a/src/resourcefiles/resourcefile.cpp +++ b/src/resourcefiles/resourcefile.cpp @@ -450,6 +450,8 @@ bool FResourceFile::FindPrefixRange(FString filter, void *lumps, size_t lumpsize FResourceLump *lump; int cmp; + end = start = 0; + // Pretend that our range starts at 1 instead of 0 so that we can avoid // unsigned overflow if the range starts at the first lump. lumps = (BYTE *)lumps - lumpsize; From bd96adafda8499d6231c222ed338def7ebde5d66 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 4 Apr 2015 14:12:04 +0200 Subject: [PATCH 2/2] - cleanup --- src/doomdata.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/doomdata.h b/src/doomdata.h index c08714f46..b51dd5d20 100644 --- a/src/doomdata.h +++ b/src/doomdata.h @@ -365,8 +365,6 @@ struct FMapThing short pitch; short roll; DWORD RenderStyle; - - //void Serialize (FArchive &); };