Merge branch 'bugfix/sentinel-sigint-crash' into develop

cl1111 · Jun 17, 2020 · 3bf92ad · 3bf92ad
2 parents 7f7bbed + 7ce82ac
commit 3bf92ad
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Win32_Interop/Win32_Common.cpp b/src/Win32_Interop/Win32_Common.cpp
@@ -29,6 +29,12 @@ namespace Globals
 /* This function is used to force the VEH on the entire size of the buffer length,
  * in the event that the buffer crosses the memory page boundaries */
 void EnsureMemoryIsMapped(const void *buffer, size_t size) {
+    //[tporadowski/#62] when this is called from main process - Globals::pageSize is not initialized,
+    //                  so prevent EXCEPTION_INT_DIVIDE_BY_ZERO
+    if (Globals::pageSize == 0) {
+        return;
+    }
+
     char* pFirstByte = (char*) buffer;
     char* pLastByte = (char*) buffer + size - 1;
     char* pFirstPage = pFirstByte - ((size_t) pFirstByte % Globals::pageSize);