[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[japhet at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit ecfc5bf3b86a18a566efb4527bf2abca3db71b8f
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 16 22:40:17 2009 +0000

    2009-11-16  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Handle the case of a null NPObject* in NPN_SetException in
            the V8 bindings.  This allow out of process plugins calling
            NPN_SetException to just send null instead of sending an
            NPObject* that would be an address in a different
            process's memory space.
    
            https://bugs.webkit.org/show_bug.cgi?id=31561
    
            * bindings/v8/NPV8Object.cpp:
            (_NPN_SetException): Allow null NPObject* and just throw a general error.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51054 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4624be3..8ac130d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-16  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Handle the case of a null NPObject* in NPN_SetException in
+        the V8 bindings.  This allow out of process plugins calling
+        NPN_SetException to just send null instead of sending an
+        NPObject* that would be an address in a different 
+        process's memory space.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31561
+
+        * bindings/v8/NPV8Object.cpp:
+        (_NPN_SetException): Allow null NPObject* and just throw a general error.
+
 2009-11-16  Alexey Proskuryakov  <ap at apple.com>
 
         Windows build fix.
diff --git a/WebCore/bindings/v8/NPV8Object.cpp b/WebCore/bindings/v8/NPV8Object.cpp
index 7cfaab1..2910bd7 100644
--- a/WebCore/bindings/v8/NPV8Object.cpp
+++ b/WebCore/bindings/v8/NPV8Object.cpp
@@ -400,7 +400,7 @@ bool _NPN_HasMethod(NPP npp, NPObject* npObject, NPIdentifier methodName)
 
 void _NPN_SetException(NPObject* npObject, const NPUTF8 *message)
 {
-    if (npObject->_class != npScriptObjectClass) {
+    if (!npObject || npObject->_class != npScriptObjectClass) {
         // We won't be able to find a proper scope for this exception, so just throw it.
         // This is consistent with JSC, which throws a global exception all the time.
         V8Proxy::throwError(V8Proxy::GeneralError, message);

-- 
WebKit Debian packaging