Fix 3 potential buffer overrun

OpenSmalltalk · Jan 1, 2019 · e5cd4fb · e5cd4fb
1 parent 1f61637
commit e5cd4fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/platforms/win32/vm/sqWin32ExternalPrims.c b/platforms/win32/vm/sqWin32ExternalPrims.c
@@ -43,7 +43,7 @@ void *ioLoadModule(char *pluginName)
 #ifdef UNICODE
 	int len = MultiByteToWideChar(CP_UTF8, 0, pluginName, -1, NULL, 0);
 	if (len <= 0) return 0; /* invalid UTF8 ? */
-	name = alloca(len);
+	name = alloca(len*sizeof(WCHAR));
 	if (MultiByteToWideChar(CP_UTF8, 0, pluginName, -1, name, len) == 0) return 0;
 #else
 	name = pluginName;

diff --git a/platforms/win32/vm/sqWin32Utils.c b/platforms/win32/vm/sqWin32Utils.c
@@ -26,7 +26,7 @@ int __cdecl sqMessageBox(DWORD dwFlags, const TCHAR *titleString, const TCHAR* f
 
   buf = (TCHAR*) calloc(sizeof(TCHAR), 4096);
   va_start(args, fmt);
-  _vsntprintf(buf, 4096, fmt, args);
+  _vsntprintf(buf, 4096-1, fmt, args);
   va_end(args);
 
   result = MessageBox(stWindow,buf,titleString,dwFlags|MB_SETFOREGROUND);

diff --git a/platforms/win32/vm/sqWin32Window.c b/platforms/win32/vm/sqWin32Window.c
@@ -72,7 +72,7 @@ char  vmPathA[MAX_PATH_UTF8 + 1];    /* full path to interpreter's directory */
 WCHAR vmPathW[MAX_PATH      + 1];    /* full path to interpreter's directory */
 char  vmNameA[MAX_PATH_UTF8 + 1];    /* name of the interpreter's executable UTF8 */
 WCHAR vmNameW[MAX_PATH      + 1];    /* name of the interpreter's executable UTF16 */
-char windowTitle[MAX_PATH];          /* what should we display in the title? */
+char windowTitle[MAX_PATH+1];        /* what should we display in the title? */
 TCHAR squeakIniName[MAX_PATH+1];     /* full path and name to ini file */
 TCHAR windowClassName[MAX_PATH+1];   /* Window class name */