Double free fix when zd_main hands control back to Obsidian

Tweaks for cross-platform compilation
obsidian-level-maker · Jul 28, 2021 · 3557906 · 3557906
1 parent 997d143
commit 3557906
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 25 deletions.
diff --git a/source_files/ff_src/lex.yy.c b/source_files/ff_src/lex.yy.c
@@ -431,9 +431,11 @@ char *yytext;
 #define INITIAL 0
 
 /*windows compatibility case*/
+#if WIN32
 #include <io.h>
 #define isatty _isatty
 #define fileno _fileno
+#endif
 
 #ifndef YY_EXTRA_TYPE
 #define YY_EXTRA_TYPE void *

diff --git a/source_files/gui/g_doom.cc b/source_files/gui/g_doom.cc
@@ -846,7 +846,7 @@ int DM_NumThings() {
 
 #include "zdmain.h"
 
-static bool DM_BuildNodes(const char *filename, const char *out_name) {
+static bool DM_BuildNodes(const char *filename) {
     LogPrintf("\n");
 
     zdbsp_options options;
@@ -894,7 +894,6 @@ static bool DM_BuildNodes(const char *filename, const char *out_name) {
     	if (!UDMF_mode) {
     		if (!build_nodes) {
 			    LogPrintf("Skipping nodes per user selection...\n");
-		        FileRename(filename, out_name);
 		        return true;
 		     }
         }
@@ -913,7 +912,6 @@ static bool DM_BuildNodes(const char *filename, const char *out_name) {
     } else if (current_engine == "zdoom") {
         if (!build_nodes) {
             LogPrintf("Skipping nodes per user selection...\n");
-            FileRename(filename, out_name);
             return true;
         }
         options.build_nodes = true;
@@ -935,8 +933,6 @@ static bool DM_BuildNodes(const char *filename, const char *out_name) {
         return false;
     }
 
-    FileRename(filename, out_name);
-
     return true;
 }
 
@@ -1033,21 +1029,8 @@ bool doom_game_interface_c::Start(const char *preset) {
 }
 
 bool doom_game_interface_c::BuildNodes() {
-    char *temp_name = ReplaceExtension(filename, "tmp");
-
-    FileDelete(temp_name);
-
-    if (!FileRename(filename, temp_name)) {
-        LogPrintf("WARNING: could not rename file to .TMP!\n");
-        StringFree(temp_name);
-        return false;
-    }
-
-    bool result = DM_BuildNodes(temp_name, filename);
-
-    FileDelete(temp_name);
 
-    StringFree(temp_name);
+    bool result = DM_BuildNodes(filename);
 
     return result;
 }

diff --git a/source_files/gui/headers.h b/source_files/gui/headers.h
@@ -22,7 +22,9 @@
 #define __OBLIGE_INCLUDES_H__
 
 // we C++
+#ifndef NULL
 #define NULL nullptr
+#endif
 
 /* OS specifics */
 #ifdef WIN32

diff --git a/source_files/gui/sys_macro.h b/source_files/gui/sys_macro.h
@@ -23,10 +23,6 @@
 
 // basic macros
 
-#ifndef NULL
-#define NULL ((void *)0)
-#endif
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif

diff --git a/source_files/zdbsp_src/zdwad.cc b/source_files/zdbsp_src/zdwad.cc
@@ -78,8 +78,6 @@ void FWadReader::Close() {
 }
 
 FWadReader::~FWadReader() {
-    if (File) fclose(File);
-    if (Lumps) delete[] Lumps;
 }
 
 bool FWadReader::IsIWAD() const { return Header.Magic[0] == 'I'; }