[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 914b6e5d1340af0d1f98974a5a02963892261056
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 19 19:49:00 2002 +0000

    	Fixed: 3100597 - repro NSArray exception using contextual menu
    
            * Misc.subproj/WebNSPasteboardExtras.m:
            (-[NSPasteboard _web_writeURL:andTitle:withOwner:]): more error checking
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b0d6195..169eb90 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3100597 - repro NSArray exception using contextual menu
+
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (-[NSPasteboard _web_writeURL:andTitle:withOwner:]): more error checking
+
 2002-11-19  Trey Matteson  <trey at apple.com>
 
 	Just a tweak to the description printout.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b0d6195..169eb90 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3100597 - repro NSArray exception using contextual menu
+
+        * Misc.subproj/WebNSPasteboardExtras.m:
+        (-[NSPasteboard _web_writeURL:andTitle:withOwner:]): more error checking
+
 2002-11-19  Trey Matteson  <trey at apple.com>
 
 	Just a tweak to the description printout.
diff --git a/WebKit/Misc.subproj/WebNSPasteboardExtras.m b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
index 6d65826..25c0db3 100644
--- a/WebKit/Misc.subproj/WebNSPasteboardExtras.m
+++ b/WebKit/Misc.subproj/WebNSPasteboardExtras.m
@@ -10,6 +10,7 @@
 #import <WebKit/WebNSPasteboardExtras.h>
 #import <WebKit/WebURLsWithTitles.h>
 
+#import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebNSStringExtras.h>
 #import <WebFoundation/WebNSURLExtras.h>
 
@@ -65,16 +66,22 @@ NSString *WebURLNamePboardType = nil;
 
 - (void)_web_writeURL:(NSURL *)URL andTitle:(NSString *)title withOwner:(id)owner
 {
+    ASSERT(URL);
+    
     NSArray *types = [NSArray arrayWithObjects:WebURLsWithTitlesPboardType, NSURLPboardType, NSStringPboardType, nil];
     [self declareTypes:types owner:owner];
 
     [URL writeToPasteboard:self];
     [self setString:[URL absoluteString] forType:NSStringPboardType];
-    [WebURLsWithTitles writeURLs:[NSArray arrayWithObject:URL] andTitles:[NSArray arrayWithObject:title] toPasteboard:self];
-    [self setString:[URL absoluteString] forType:WebURLPboardType];
+
+    NSArray *titles = nil;
     if(title && ![title isEqualToString:@""]){
+        titles = [NSArray arrayWithObject:title];
         [self setString:title forType:WebURLNamePboardType];
     }
+    
+    [WebURLsWithTitles writeURLs:[NSArray arrayWithObject:URL] andTitles:titles toPasteboard:self];
+    [self setString:[URL absoluteString] forType:WebURLPboardType];
 }
 
 @end

-- 
WebKit Debian packaging