[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 7c2fffa6cd31b14194065dd433983634f598dd7b
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 8 20:49:12 2004 +0000

    	Fixed: <rdar://problem/3720728> REGRESSION (125.8-146): Crash moving mouse over plugin at manray-photo.com
    
            Reviewed by john.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView pluginScriptableObject]): don't call NPP_GetValue unless the plug-in implements it
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6978 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c36947a..c18ee7b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2004-07-08  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: <rdar://problem/3720728> REGRESSION (125.8-146): Crash moving mouse over plugin at manray-photo.com
+	
+        Reviewed by john.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView pluginScriptableObject]): don't call NPP_GetValue unless the plug-in implements it
+
+2004-07-08  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: <rdar://problem/3706296> VIP: ifilm.com crashing reproducibly with Safari
 
         Reviewed by kocienda.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 938f0ec..c07b4dc 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1266,13 +1266,13 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
 
 - (void *)pluginScriptableObject
 {
-    void *value;
-    NPError npErr;
-    
-    npErr = NPP_GetValue (instance, NPPVpluginScriptableNPObject, (void *)&value);
-    if (npErr == NPERR_NO_ERROR)
-        return value;
-
+    if (NPP_GetValue) {
+        void *value;
+        NPError npErr = NPP_GetValue (instance, NPPVpluginScriptableNPObject, (void *)&value);
+        if (npErr == NPERR_NO_ERROR) {
+            return value;
+        }
+    }
     return (void *)0;
 }
 

-- 
WebKit Debian packaging