Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome_elf / blacklist / blacklist_interceptions.cc

diff --git a/src/chrome_elf/blacklist/blacklist_interceptions.cc b/src/chrome_elf/blacklist/blacklist_interceptions.cc
index 6b01438..9a3bdab 100644 (file)
--- a/src/chrome_elf/blacklist/blacklist_interceptions.cc
+++ b/src/chrome_elf/blacklist/blacklist_interceptions.cc
@@ -148,7 +148,8 @@ void SafeGetImageInfo(const base::win::PEImage& pe,
           *flags |= sandbox::MODULE_HAS_CODE;
       }
     }
-  } __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ?
+  } __except((GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ||
+              GetExceptionCode() == EXCEPTION_IN_PAGE_ERROR) ?
              EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) {
     out_name->clear();
   }
@@ -224,9 +225,19 @@ SANDBOX_INTERCEPT NTSTATUS WINAPI BlNtMapViewOfSection(
       g_nt_unmap_view_of_section_func(process, *base);
       ret = STATUS_UNSUCCESSFUL;
     }
-
   }
+
   return ret;
 }
 
+#if defined(_WIN64)
+NTSTATUS WINAPI BlNtMapViewOfSection64(
+    HANDLE section, HANDLE process, PVOID *base, ULONG_PTR zero_bits,
+    SIZE_T commit_size, PLARGE_INTEGER offset, PSIZE_T view_size,
+    SECTION_INHERIT inherit, ULONG allocation_type, ULONG protect) {
+  return BlNtMapViewOfSection(g_nt_map_view_of_section_func, section, process,
+                              base, zero_bits, commit_size, offset, view_size,
+                              inherit, allocation_type, protect);
+}
+#endif
 }  // namespace blacklist