From 29a2f3c6d330e1698a365a1d0036b6220f0e964e Mon Sep 17 00:00:00 2001 From: "Hironori.Fujii@sony.com" Date: Thu, 10 May 2018 07:15:42 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231635 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKitLegacy/win/ChangeLog | 13 +++++++++++++ Source/WebKitLegacy/win/WebPreferences.cpp | 2 ++ Source/WebKitLegacy/win/WebPreferences.h | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog index f2cce84..78144c5 100644 --- a/Source/WebKitLegacy/win/ChangeLog +++ b/Source/WebKitLegacy/win/ChangeLog @@ -1,3 +1,16 @@ +2018-05-10 Fujii Hironori + + 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 Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty() diff --git a/Source/WebKitLegacy/win/WebPreferences.cpp b/Source/WebKitLegacy/win/WebPreferences.cpp index b78c37a..a2f05c7 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(this); else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate6)) *ppvObject = static_cast(this); + else if (IsEqualGUID(riid, IID_IWebPreferencesPrivate7)) + *ppvObject = static_cast(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 fc3782a..9d93ff2 100644 --- a/Source/WebKitLegacy/win/WebPreferences.h +++ b/Source/WebKitLegacy/win/WebPreferences.h @@ -30,7 +30,7 @@ #include #include -class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate6 { +class WebPreferences : public IWebPreferences, public IWebPreferencesPrivate7 { public: static WebPreferences* createInstance(); protected: -- 1.8.3.1