Fix possible uninitialized read on Windows

gbdev · Aug 31, 2020 · 7f3b0be · 7f3b0be
1 parent df77693
commit 7f3b0be
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/asm/lexer.c b/src/asm/lexer.c
@@ -320,16 +320,16 @@ static void initState(struct LexerState *state)
 # include <winbase.h>
 # define MAP_FAILED NULL
 # define mapFile(ptr, fd, path, size) do { \
+	(ptr) = MAP_FAILED; \
 	HANDLE file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, \
 				  FILE_FLAG_POSIX_SEMANTICS | FILE_FLAG_RANDOM_ACCESS, NULL); \
 	HANDLE mappingObj; \
 	\
 	if (file == INVALID_HANDLE_VALUE) \
 		break; \
 	mappingObj  = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); \
-	(ptr) = mappingObj == INVALID_HANDLE_VALUE \
-			? NULL \
-		: MapViewOfFile(mappingObj, FILE_MAP_READ, 0, 0, 0); \
+	if (mappingObj != INVALID_HANDLE_VALUE) \
+		(ptr) = MapViewOfFile(mappingObj, FILE_MAP_READ, 0, 0, 0); \
 	CloseHandle(mappingObj); \
 	CloseHandle(file); \
 } while (0)