From 90b3510f1989cad606f8a5034fa8b5ddada0ea69 Mon Sep 17 00:00:00 2001
From: Sir Walrus <sir@walrus.se>
Date: Wed, 22 May 2024 22:17:36 +0200
Subject: [PATCH] fix #74

---
 flips.cpp | 14 ++++++++------
 flips.h   |  8 ++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/flips.cpp b/flips.cpp
index e649253..99e360b 100644
--- a/flips.cpp
+++ b/flips.cpp
@@ -478,14 +478,15 @@ LPWSTR config::flatten()
 	}
 	
 	LPWSTR ret = (LPWSTR)malloc((len+1)*sizeof(WCHAR));
+	LPWSTR end = ret + len+1;
 	
 	LPWSTR at = ret;
-	at += wsprintf(at, TEXT("%s"), header);
+	at += swprintf(at, end-at, TEXT("%s"), header);
 	for (size_t i=0;i<this->numentries;i++)
 	{
 		if (this->values[i]!=NULL)
 		{
-			at += wsprintf(at, TEXT("%s=%s\n"), this->names[i], this->values[i]);
+			at += swprintf(at, end-at, TEXT("%s=%s\n"), this->names[i], this->values[i]);
 		}
 	}
 	
@@ -522,7 +523,7 @@ config cfg;
 static LPWSTR EmuGetKey(LPCWSTR filename)
 {
 	static WCHAR ret[64];
-	wsprintf(ret, TEXT("emu%s"), GetExtension(filename));
+	swprintf(ret, 64, TEXT("emu%s"), GetExtension(filename));
 	return ret;
 }
 
@@ -561,9 +562,10 @@ static void CfgSumName(WCHAR* out, int type, const void* sum)
 {
 	const uint8_t* sum8 = (uint8_t*)sum;
 	wcscpy(out, checkmap_typenames[type]);
+	WCHAR* bufend = out + CfgSumNameMaxLen;
 	WCHAR* end = out + wcslen(checkmap_typenames[type]);
 	for (int i=0;i<checkmap_sum_size[type];i++)
-		wsprintf(end+i*2, TEXT("%.2X"), sum8[i]);
+		swprintf(end+i*2, bufend-(end+i*2), TEXT("%.2X"), sum8[i]);
 }
 static bool CfgSumParseName(int* type, void* sum, LPCWSTR in)
 {
@@ -823,7 +825,7 @@ struct errorinfo ApplyPatchMem2(file* patch, struct mem inrom, bool verifyinput,
 #else
 # define z "z"
 #endif
-				sprintf(errtext, "This patch is not intended for this ROM. Expected file size %" z "u, got %" z "u.", inf.size_in, inrom.len);
+				snprintf(errtext, 256, "This patch is not intended for this ROM. Expected file size %" z "u, got %" z "u.", inf.size_in, inrom.len);
 				errinf.description=errtext;
 			}
 			else
@@ -831,7 +833,7 @@ struct errorinfo ApplyPatchMem2(file* patch, struct mem inrom, bool verifyinput,
 				uint32_t crc = crc32(inrom.ptr, inrom.len);
 				if (inf.crc_in != crc)
 				{
-					sprintf(errtext, "This patch is not intended for this ROM. Expected checksum %.8X, got %.8X.", inf.crc_in, crc);
+					snprintf(errtext, 256, "This patch is not intended for this ROM. Expected checksum %.8X, got %.8X.", inf.crc_in, crc);
 					errinf.description=errtext;
 				}
 			}
diff --git a/flips.h b/flips.h
index 53a40c3..5461a59 100644
--- a/flips.h
+++ b/flips.h
@@ -88,7 +88,7 @@
 #define wcsicmp strcasecmp
 //#define wcsnicmp strncasecmp
 #define wprintf printf
-#define wsprintf sprintf
+#define swprintf snprintf
 #define wscanf scanf
 #define swscanf sscanf
 #define wtoi atoi
@@ -121,6 +121,10 @@ static inline char* strdup(const char * in)
 }
 #endif
 
+#define sprintf USE%snprintf%INSTEAD
+#define wsprintf USE%swprintf%INSTEAD
+#define wsnprintf ITS%CALLED%swprintf
+
 #include "libbps.h"
 #include "libips.h"
 #include "libups.h"
@@ -212,7 +216,7 @@ public:
 	void set(LPCWSTR key, LPCWSTR value); // If NULL, the key is removed. This may alter or rearrange unrelated get{name,value}byid values.
 	LPCWSTR get(LPCWSTR key, LPCWSTR def = NULL);
 	
-	void setint(LPCWSTR key, int value) { WCHAR valstr[16]; wsprintf(valstr, TEXT("%i"), value); set(key, valstr); }
+	void setint(LPCWSTR key, int value) { WCHAR valstr[16]; swprintf(valstr, 16, TEXT("%i"), value); set(key, valstr); }
 	int getint(LPCWSTR key, int def = 0) { LPCWSTR val = get(key); return val ? wtoi(val) : def; }
 	
 	size_t getcount() { return numentries; }