[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
andersca at apple.com
andersca at apple.com
Fri Jan 21 14:36:35 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit b4ea5e3c24c9d4df11d2d1b50985d94f93ba1d66
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 02:59:41 2010 +0000
2010-12-22 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
Webkit2: WebProcess crashes when Private browsing is turned on on yahoo.com
https://bugs.webkit.org/show_bug.cgi?id=51516
<rdar://problem/8766995>
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::NPP_SetValue):
Add a null check for NPP_SetValue.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74531 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 12bd454..072c4b6 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Sam Weinig.
+ Webkit2: WebProcess crashes when Private browsing is turned on on yahoo.com
+ https://bugs.webkit.org/show_bug.cgi?id=51516
+ <rdar://problem/8766995>
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::NPP_SetValue):
+ Add a null check for NPP_SetValue.
+
+2010-12-22 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
REGRESSION (WK2): Plugins swallow CMD-W, CMD-Q, and probably other shortcuts
https://bugs.webkit.org/show_bug.cgi?id=51515
<rdar://problem/8740926>
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
index 8f34b38..93095be 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
@@ -324,6 +324,9 @@ NPError NetscapePlugin::NPP_GetValue(NPPVariable variable, void *value)
NPError NetscapePlugin::NPP_SetValue(NPNVariable variable, void *value)
{
+ if (!m_pluginModule->pluginFuncs().setvalue)
+ return NPERR_GENERIC_ERROR;
+
return m_pluginModule->pluginFuncs().setvalue(&m_npp, variable, value);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list