diff --git a/quakespasm/Quake/sys_sdl_win.c b/quakespasm/Quake/sys_sdl_win.c
index 82828945..85f75edd 100644
--- a/quakespasm/Quake/sys_sdl_win.c
+++ b/quakespasm/Quake/sys_sdl_win.c
@@ -158,9 +158,11 @@ static char	cwd[1024];
 
 static void Sys_GetBasedir (char *argv0, char *dst, size_t dstsize)
 {
-	char		*tmp;
+	char *tmp;
+	size_t rc;
 
-	if (GetCurrentDirectory(dstsize, dst) == 0)
+	rc = GetCurrentDirectory(dstsize, dst);
+	if (rc == 0 || rc > dstsize)
 		Sys_Error ("Couldn't determine current directory");
 
 	tmp = dst;