From 29ecbac96378dc1e5b43d640e12d5f27819b2620 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 25 Nov 2014 17:00:17 +0100
Subject: [PATCH] - fixed: The demo buffer was allocated with conflicting
 methods, because M_ReadFile used new whereas the rest of the demo code
 assumed malloc. Added a new M_ReadFileMalloc function to handle this case
 without rewriting other things.

---
 src/g_game.cpp |  2 +-
 src/m_misc.cpp | 26 ++++++++++++++++++++++++++
 src/m_misc.h   |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/g_game.cpp b/src/g_game.cpp
index 734500e553..beec9435ae 100644
--- a/src/g_game.cpp
+++ b/src/g_game.cpp
@@ -2636,7 +2636,7 @@ void G_DoPlayDemo (void)
 	{
 		FixPathSeperator (defdemoname);
 		DefaultExtension (defdemoname, ".lmp");
-		M_ReadFile (defdemoname, &demobuffer);
+		M_ReadFileMalloc (defdemoname, &demobuffer);
 	}
 	demo_p = demobuffer;
 
diff --git a/src/m_misc.cpp b/src/m_misc.cpp
index c550c4593c..7f4fa482d9 100644
--- a/src/m_misc.cpp
+++ b/src/m_misc.cpp
@@ -137,6 +137,32 @@ int M_ReadFile (char const *name, BYTE **buffer)
 	return length;
 }
 
+//
+// M_ReadFile (same as above but use malloc instead of new to allocate the buffer.)
+//
+int M_ReadFileMalloc (char const *name, BYTE **buffer)
+{
+	int handle, count, length;
+	struct stat fileinfo;
+	BYTE *buf;
+
+	handle = open (name, O_RDONLY | O_BINARY, 0666);
+	if (handle == -1)
+		I_Error ("Couldn't read file %s", name);
+	if (fstat (handle,&fileinfo) == -1)
+		I_Error ("Couldn't read file %s", name);
+	length = fileinfo.st_size;
+	buf = (BYTE*)M_Malloc(length);
+	count = read (handle, buf, length);
+	close (handle);
+
+	if (count < length)
+		I_Error ("Couldn't read file %s", name);
+
+	*buffer = buf;
+	return length;
+}
+
 //---------------------------------------------------------------------------
 //
 // PROC M_FindResponseFile
diff --git a/src/m_misc.h b/src/m_misc.h
index 90844221f5..9599306de3 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -33,6 +33,7 @@ extern FGameConfigFile *GameConfig;
 
 bool M_WriteFile (char const *name, void *source, int length);
 int M_ReadFile (char const *name, BYTE **buffer);
+int M_ReadFileMalloc (char const *name, BYTE **buffer);
 void M_FindResponseFile (void);
 
 // [RH] M_ScreenShot now accepts a filename parameter.