Title: [214943] trunk/Source/WebKit
Revision
214943
Author
[email protected]
Date
2017-04-05 06:19:57 -0700 (Wed, 05 Apr 2017)

Log 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 <[email protected]> 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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (214942 => 214943)


--- trunk/Source/WebKit/ChangeLog	2017-04-05 13:07:09 UTC (rev 214942)
+++ trunk/Source/WebKit/ChangeLog	2017-04-05 13:19:57 UTC (rev 214943)
@@ -1,3 +1,20 @@
+2017-04-05  Fujii Hironori  <[email protected]>
+
+        [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  <[email protected]>
 
         Clean up the "StorageType" enum.

Modified: trunk/Source/WebKit/PlatformWin.cmake (214942 => 214943)


--- trunk/Source/WebKit/PlatformWin.cmake	2017-04-05 13:07:09 UTC (rev 214942)
+++ trunk/Source/WebKit/PlatformWin.cmake	2017-04-05 13:19:57 UTC (rev 214943)
@@ -470,11 +470,7 @@
 list(APPEND WebKit_LIBRARIES ${CXX_LIBS})
 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,
 # It fails with an unusual error - midl failed - failed to save all changes
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to