[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 057b0fbde516657f1e532deb7d65a7b04e9d8633
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 13 18:04:22 2002 +0000

    	Catch NULL status strings passed to NPN_Status.
    
            Reviewed by darin.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView status:]): check the incoming string before calling [NSString stringWithCString]
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 288b165..2b1978a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-13  Chris Blumenberg  <cblu at apple.com>
+
+	Catch NULL status strings passed to NPN_Status.
+	
+        Reviewed by darin.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView status:]): check the incoming string before calling [NSString stringWithCString]
+
 2002-12-12  Trey Matteson  <trey at apple.com>
 
 	3117101 - PLT slows down as history fills up
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 9e13e27..6d5bc4f 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -984,11 +984,16 @@
 }
 
 -(void)status:(const char *)message
-{
-    LOG(Plugins, "NPN_Status: %s", message);
-    if([self controller]){
-        [[[self controller] windowOperationsDelegate] setStatusText:[NSString stringWithCString:message]];
+{    
+    if (!message) {
+        ERROR("NPN_Status passed a NULL status message");
+        return;
     }
+
+    NSString *status = (NSString *)CFStringCreateWithCString(NULL, message, kCFStringEncodingMacRoman);
+    LOG(Plugins, "NPN_Status: %@", status);
+    [[[self controller] windowOperationsDelegate] setStatusText:status];
+    [status release];
 }
 
 -(void)invalidateRect:(NPRect *)invalidRect

-- 
WebKit Debian packaging