Changeset 214943 in webkit

Timestamp:

Apr 5, 2017 6:19:57 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo] Invalid address specified to RtlValidateHeap at std::ctype<char>::_Tidy() when finishing MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=157067

Patch by Fujii Hironori <Fujii Hironori> on 2017-04-05
Reviewed by Per Arne Vollan.

WebKit is compiled with /MT switch to use static CRT on Windows.
But, WinCairo port does not link the static CRT by specifying
/NODEFAULTLIB:LIBCMT and /NODEFAULTLIB:LIBCMTD switches.
Eventually, a dynamically linked CRT is linked. This causes
potential heap corruption.

• PlatformWin.cmake: Do not set /NODEFAULTLIB:LIBCMT and

/NODEFAULTLIB:LIBCMTD, but /NODEFAULTLIB:MSVCRT and
/NODEFAULTLIB:MSVCRTD as well as AppleWin port does

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformWin.cmake (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-04-05  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] Invalid address specified to RtlValidateHeap at std::ctype<char>::_Tidy() when finishing MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=157067
+
+        Reviewed by Per Arne Vollan.
+
+        WebKit is compiled with /MT switch to use static CRT on Windows.
+        But, WinCairo port does not link the static CRT by specifying
+        /NODEFAULTLIB:LIBCMT and /NODEFAULTLIB:LIBCMTD switches.
+        Eventually, a dynamically linked CRT is linked.  This causes
+        potential heap corruption.
+
+        * PlatformWin.cmake: Do not set /NODEFAULTLIB:LIBCMT and
+        /NODEFAULTLIB:LIBCMTD, but /NODEFAULTLIB:MSVCRT and
+        /NODEFAULTLIB:MSVCRTD as well as AppleWin port does
+
 2017-03-31  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/PlatformWin.cmake

@@ -471 +471 @@
 set(CMAKE_CXX_STANDARD_LIBRARIES "")
 
-if (${WTF_PLATFORM_WIN_CAIRO})
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD")
-else ()
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCRTD")
-endif ()
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCRTD")
 
 # If this directory isn't created before midl runs and attempts to output WebKit.tlb,