Bulletproof the url going into a std::string and ensure it's not going to...

chrome/browser/cocoa/web_drop_target.mm

Index: chrome/browser/cocoa/web_drop_target.mm
===================================================================
--- chrome/browser/cocoa/web_drop_target.mm	(revision 31264)
+++ chrome/browser/cocoa/web_drop_target.mm	(working copy)
@@ -184,11 +184,18 @@
   NSArray* titles = nil;
   [pboard getURLs:&urls andTitles:&titles];
   NSString* urlString = [urls objectAtIndex:0];
-  NSURL* url = [NSURL URLWithString:urlString];
-  if (![url scheme])
-    urlString = [[NSURL fileURLWithPath:urlString] absoluteString];
-  data->url = GURL([urlString UTF8String]);
-  data->url_title = base::SysNSStringToUTF16([titles objectAtIndex:0]);
+  if ([urlString length]) {
+    NSURL* url = [NSURL URLWithString:urlString];
+    if (![url scheme])
+      urlString = [[NSURL fileURLWithPath:urlString] absoluteString];
+    // Check again just to make sure to not assign NULL into a std::string,
+    // which throws an exception.
+    const char* utf8Url = [urlString UTF8String];
+    if (utf8Url) {
+      data->url = GURL(utf8Url);
+      data->url_title = base::SysNSStringToUTF16([titles objectAtIndex:0]);

[viettrungluu, 2009/11/06 21:29:17]

I'm 99.99% sure that |SysNSStringToUTF16()| chokes if passed nil, so this should
be something like:

  if (NSString* title = [titles objectAtIndex:0])
    data->url_title = base::SysNSStringToUTF16(title);

(|-objectAtIndex:| shouldn't return nil, but is there any guarantee that
|titles| isn't nil?)

+    }
+  }
 }
 
 // Given |data|, which should not be nil, fill it in using the contents of the