From 2991ae067d752f00d20bdc5034435db9a31cc5ca Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Fri, 12 Jul 2019 13:44:31 -0700
Subject: [PATCH] BuildROMS: Cleanup potential buffer overrun and execution
 with MinGW

As discussed in  #717
---
 makefile        | 13 +++++++------
 sim_BuildROMs.c |  8 +++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/makefile b/makefile
index d44fb529..085df4ec 100644
--- a/makefile
+++ b/makefile
@@ -887,7 +887,7 @@ ifeq ($(WIN32),)  #*nix Environments (&& cygwin)
     NETWORK_OPT = $(NETWORK_CCDEFS)
   endif
   ifneq (binexists,$(shell if $(TEST) -e BIN/buildtools; then echo binexists; fi))
-    MKDIRBIN = mkdir -p BIN/buildtools
+    MKDIRBIN = @mkdir -p BIN/buildtools
   endif
   ifeq (commit-id-exists,$(shell if $(TEST) -e .git-commit-id; then echo commit-id-exists; fi))
     GIT_COMMIT_ID=$(shell grep 'SIM_GIT_COMMIT_ID' .git-commit-id | awk '{ print $$2 }')
@@ -1003,8 +1003,10 @@ else
   OS_CCDEFS += -fms-extensions $(PTHREADS_CCDEFS)
   OS_LDFLAGS += -lm -lwsock32 -lwinmm $(PTHREADS_LDFLAGS)
   EXE = .exe
-  ifneq (binexists,$(shell if exist BIN\buildtools echo binexists))
-    MKDIRBIN = if not exist BIN mkdir BIN\buildtools
+  ifneq (clean,$(MAKECMDGOALS))
+    ifneq (buildtoolsexists,$(shell if exist BIN\buildtools (echo buildtoolsexists) else (mkdir BIN\buildtools)))
+      MKDIRBIN=
+    endif
   endif
   ifneq ($(USE_NETWORK),)
     NETWORK_OPT += -DUSE_SHARED
@@ -2022,11 +2024,10 @@ ${BUILD_ROMS} :
 	${MKDIRBIN}
 ifeq ($(WIN32),)
 	@if $(TEST) \( ! -e $@ \) -o \( sim_BuildROMs.c -nt $@ \) ; then ${CC} sim_BuildROMs.c $(CC_OUTSPEC); fi
-	@$@
 else
-	if not exist $@ ${CC} sim_BuildROMs.c $(CC_OUTSPEC)
-	$(@D)\$(@F)
+	@if not exist $@ ${CC} sim_BuildROMs.c $(CC_OUTSPEC)
 endif
+	@$@
 
 #
 # Individual builds
diff --git a/sim_BuildROMs.c b/sim_BuildROMs.c
index 87572ff6..2d6878d1 100644
--- a/sim_BuildROMs.c
+++ b/sim_BuildROMs.c
@@ -66,7 +66,7 @@ struct ROM_File_Descriptor {
    {"VAX/ka750_old.bin",                "VAX/vax_ka750_bin_old.h",                   1024,            0xFFFEBAA5,        "vax_ka750_bin_old", "From ROM set: 990A9, 948A9, 906A9, 905A9 (Boots: A=DD, B=DM, C=DL, D=DU"},
    {"VAX/vcb02.bin",                    "VAX/vax_vcb02_bin.h",                      16384,            0xFFF1D2AD,        "vax_vcb02_bin"},
    {"VAX/vmb.exe",                      "VAX/vax_vmb_exe.h",                        44544,            0xFFC014BB,        "vax_vmb_exe"},
-   {"PDP11/lunar11/lunar.lda",          "PDP11/pdp11_vt_lunar_rom.h",               13824   ,         0xFFF15D00,        "lunar_lda"},
+   {"PDP11/lunar11/lunar.lda",          "PDP11/pdp11_vt_lunar_rom.h",               13824,            0xFFF15D00,        "lunar_lda"},
    {"PDP11/dazzledart/dazzle.lda",      "PDP11/pdp11_dazzle_dart_rom.h",             6096,            0xFFF83848,        "dazzle_lda"},
    {"PDP11/11logo/11logo.lda",          "PDP11/pdp11_11logo_rom.h",                 26009,            0xFFDD77F7,        "logo_lda"},
    {"swtp6800/swtp6800/swtbug.bin",     "swtp6800/swtp6800/swtp_swtbug_bin.h",       1024,            0xFFFE4FBC,        "swtp_swtbug_bin"},
@@ -83,6 +83,7 @@ struct ROM_File_Descriptor {
 #include <sys/utime.h>
 #define utimbuf _utimbuf 
 #define utime _utime
+#define snprintf _snprintf
 #else
 #include <utime.h>
 #endif
@@ -206,11 +207,12 @@ if ((c = strchr (array_name, '.')))
     *c = '_';
 if ((c = strchr (array_name, '/')))
     *c = '_';
-sprintf (include_filename, "%s.h", cleaned_rom_filename);
+include_filename[sizeof (include_filename) - 1] = '\0';
+snprintf (include_filename, sizeof (include_filename) - 1, "%s.h", cleaned_rom_filename);
 if ((c = strrchr (include_filename, '/')))
     sprintf (c+1, "%s.h", array_name);
 else
-    sprintf (include_filename, "%s.h", array_name);
+    snprintf (include_filename, sizeof (include_filename) - 1, "%s.h", array_name);
 printf ("The ROMs array entry for this new ROM image file should look something like:\n");
 printf ("{\"%s\",    \"%s\",     %d,  0x%08X, \"%s\"}\n",
         rom_filename, include_filename, (int)(statb.st_size), checksum, array_name);