Commit 77cce78d authored by Tom Ritter's avatar Tom Ritter
Browse files

Bug 1520310 - Backout the patch from Bug 1498695 and cast to void*. r=bobowen 

In Bug 1462100 we started casting to void* because mingw doesn't do
automatic conversions like MSVC does.  In Bug 1498695 I backed out that
change because I (mistakenly) thought it wasn't necessary for mingw-clang
when in actuality, I simply wasn't hitting the code path due to
SANDBOX_EXPORTS being defined.

Since we want to _not_ define SANDBOX_EXPORTS I need to put the original
patch back in place.

--HG--
extra : amend_source : a26eec746e7881fa88b963c8dd3c1fa900b6a8b6
parent 58f7b5b9

security/sandbox/chromium-shim/patches/with_update/mingw_noexports_casts.patch

0 → 100644
+41 −0
Original line number Diff line number Diff line 
# HG changeset patch

# User Tom Ritter <tom@mozilla.com>

# Date 1526498300 18000

#      Wed May 16 14:18:20 2018 -0500

# Node ID dd3f4940aeb0c4e00e8bcf1c238f2355ad793489

# Parent  cf646c80b9545db7ab548f88a482378734ee2f78

Bug 1462100 Cast to void* to avoid conversion errors on MinGW, which does not do the automatic conversion like msvc r?bobowen



MozReview-Commit-ID: 8fO9Nu9gaxh



diff --git a/security/sandbox/chromium/sandbox/win/src/interception.h b/security/sandbox/chromium/sandbox/win/src/interception.h

--- a/security/sandbox/chromium/sandbox/win/src/interception.h

+++ b/security/sandbox/chromium/sandbox/win/src/interception.h

@@ -264,25 +264,25 @@ class InterceptionManager {

 #define MAKE_SERVICE_NAME(service) &Target##service##64

 #else

 #define MAKE_SERVICE_NAME(service) &Target##service

 #endif

 

 #define ADD_NT_INTERCEPTION(service, id, num_params) \

   AddToPatchedFunctions(kNtdllName, #service, \

                         sandbox::INTERCEPTION_SERVICE_CALL, \

-                        MAKE_SERVICE_NAME(service), id)

+                        (void*)MAKE_SERVICE_NAME(service), id)

 

 #define INTERCEPT_NT(manager, service, id, num_params) \

   manager->ADD_NT_INTERCEPTION(service, id, num_params)

 

 // When intercepting the EAT it is important that the patched version of the

 // function not call any functions imported from system libraries unless

 // |TargetServices::InitCalled()| returns true, because it is only then that

 // we are guaranteed that our IAT has been initialized.

 #define INTERCEPT_EAT(manager, dll, function, id, num_params) \

   manager->AddToPatchedFunctions(dll, #function, sandbox::INTERCEPTION_EAT, \

-                                 MAKE_SERVICE_NAME(function), id)

+                                 (void*)MAKE_SERVICE_NAME(function), id)

 #endif  // SANDBOX_EXPORTS

 

 }  // namespace sandbox

 

 #endif  // SANDBOX_SRC_INTERCEPTION_H_

security/sandbox/chromium-shim/patches/with_update/patch_order.txt

+1 −0
Original line number Diff line number Diff line
@@ -18,5 +18,6 @@ mingw_operator_new.patch 
mingw_cast_getprocaddress.patch

mingw_capitalization.patch

mingw_disable_one_try.patch

mingw_noexports_casts.patch

mingw_offsetof.patch

add_aarch64_windows_support.patch

security/sandbox/chromium/sandbox/win/src/interception.h

+2 −2
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ class InterceptionManager { 
#define ADD_NT_INTERCEPTION(service, id, num_params) \

  AddToPatchedFunctions(kNtdllName, #service, \

                        sandbox::INTERCEPTION_SERVICE_CALL, \

                        MAKE_SERVICE_NAME(service), id)

                        (void*)MAKE_SERVICE_NAME(service), id)



#define INTERCEPT_NT(manager, service, id, num_params) \

  manager->ADD_NT_INTERCEPTION(service, id, num_params)
@@ -280,7 +280,7 @@ class InterceptionManager { 
// we are guaranteed that our IAT has been initialized.

#define INTERCEPT_EAT(manager, dll, function, id, num_params) \

  manager->AddToPatchedFunctions(dll, #function, sandbox::INTERCEPTION_EAT, \

                                 MAKE_SERVICE_NAME(function), id)

                                 (void*)MAKE_SERVICE_NAME(function), id)

#endif  // SANDBOX_EXPORTS



}  // namespace sandbox