Attachment 340076 Details for Bug 185505 – Patch

[patch] Patch

bug-185505-20180510160815.patch (text/plain), 2.35 KB, created by Fujii Hironori on 2018-05-10 00:08:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-05-10 00:08:16 PDT

Size: 2.35 KB

patch

obsolete

>Subversion Revision: 231629
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index f2cce84875b89f8f56f9786d7df78df8011a72eb..78144c5c242e6d655ae3ae97056dcb5aa64727fd 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-10  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        REGRESSION(r231622) [Win] Crashes for null dereference of prefsPrivate in WebView::notifyPreferencesChanged
>+        https://bugs.webkit.org/show_bug.cgi?id=185505
>+
>+        Unreviewed serious crash fix
>+
>+        Windows port crashes soon since Bug 184996.
>+
>+        * WebPreferences.cpp:
>+        (WebPreferences::QueryInterface): Added IID_IWebPreferencesPrivate7.
>+        * WebPreferences.h: Inherit IWebPreferencesPrivate7 instead of IWebPreferencesPrivate6.
>+
> 2018-05-07  Daniel Bates  <dabates@apple.com>
> 
>         Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
>diff --git a/Source/WebKitLegacy/win/WebPreferences.cpp b/Source/WebKitLegacy/win/WebPreferences.cpp
>index b78c37aa9f5e754fd2b931ea5c4e4122d3630352..a2f05c721e6ca117c3d44930e32bd8645332124a 100644
>--- a/Source/WebKitLegacy/win/WebPreferences.cpp
>+++ b/Source/WebKitLegacy/win/WebPreferences.cpp
>@@ -576,6 +576,8 @@ HRESULT WebPreferences::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppv
>         *ppvObject = static_cast<IWebPreferencesPrivate5*>(this);
>     else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate6))
>         *ppvObject = static_cast<IWebPreferencesPrivate6*>(this);
>+    else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate7))
>+        *ppvObject = static_cast<IWebPreferencesPrivate7*>(this);
>     else if (IsEqualGUID(riid, CLSID_WebPreferences))
>         *ppvObject = this;
>     else
>diff --git a/Source/WebKitLegacy/win/WebPreferences.h b/Source/WebKitLegacy/win/WebPreferences.h
>index fc3782a73003c99cc09d3310609a19ccd2338aa2..9d93ff2814674aceb947d0394dac5b78d1711f44 100644
>--- a/Source/WebKitLegacy/win/WebPreferences.h
>+++ b/Source/WebKitLegacy/win/WebPreferences.h
>@@ -30,7 +30,7 @@
> #include <WebCore/BString.h>
> #include <wtf/RetainPtr.h>
> 
>-class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate6 {
>+class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate7 {
> public:
>     static WebPreferences* createInstance();
> protected:

Actions: View | Formatted Diff | Diff

Attachments on bug 185505: 340073 | 340076