[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 ca9438a7e614b95bdb8ba83d4dcfe81e1c3183e5
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 28 17:38:07 2003 +0000

    WebKit:
    
    	Fixed: 3233442 - Crash in -[WebNetscapePluginPackage load] at http://www.adultswim.com/
    
            Reviewed by mjs.
    
            * Plugins.subproj/WebNetscapePluginPackage.m:
            (-[WebNetscapePluginPackage load]): don't call NPP_Shutdown if the plug-in fails to load
    
    WebBrowser:
    
    	Fixed: 3271123 - "Plug-in not supported" error when Real fails to load
    
            Reviewed by john.
    
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor webView:plugInFailedWithError:dataSource:]): only show the "plug-in not supported" dialog for WMP
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 523f760..85056e3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-05-27  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed: 3233442 - Crash in -[WebNetscapePluginPackage load] at http://www.adultswim.com/
+
+        Reviewed by mjs.
+
+        * Plugins.subproj/WebNetscapePluginPackage.m:
+        (-[WebNetscapePluginPackage load]): don't call NPP_Shutdown if the plug-in fails to load
+
+2003-05-27  Chris Blumenberg  <cblu at apple.com>
+
 		Don't load and save icons if the icon DB directory default is not set.
 
         Reviewed by darin.
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
index d445cb5..3e9ee50 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginPackage.m
@@ -442,8 +442,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
         LOG(Plugins, "%f main timing started", mainStart);
         npErr = pluginMainFunc(&browserFuncs, &pluginFuncs, &NPP_Shutdown);
         if (npErr != NPERR_NO_ERROR) {
-            [self unload];
-            return NO;
+            goto abort;
         }
 #if !LOG_DISABLED
         CFAbsoluteTime currentTime = CFAbsoluteTimeGetCurrent();
@@ -500,8 +499,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
         LOG(Plugins, "%f NP_Initialize timing started", initializeStart);
         npErr = NP_Initialize(&browserFuncs);
         if (npErr != NPERR_NO_ERROR) {
-            [self unload];
-            return NO;
+            goto abort;
         }
 #if !LOG_DISABLED
         CFAbsoluteTime currentTime = CFAbsoluteTimeGetCurrent();
@@ -511,8 +509,7 @@ static TransitionVector tVectorForFunctionPointer(FunctionPointer);
 
         npErr = NP_GetEntryPoints(&pluginFuncs);
         if (npErr != NPERR_NO_ERROR) {
-            [self unload];
-            return NO;
+            goto abort;
         }
         
         pluginSize = pluginFuncs.size;

-- 
WebKit Debian packaging