Merge 13388 - Properly handle empty components when converting url_parse::Par...

chrome/browser/net/url_fixer_upper.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 
 #include "chrome/browser/net/url_fixer_upper.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 namespace {
 
 // TODO(estade): Remove these ugly, ugly functions. They are only used in
 // SegmentURL. A url_parse::Parsed object keeps track of a bunch of indices into
 // a url string, and these need to be updated when the URL is converted from
 // UTF8 to UTF16. Instead of this after-the-fact adjustment, we should parse it
 // in the correct string format to begin with.
 url_parse::Component UTF8ComponentToWideComponent(
     string text_utf8,
     const url_parse::Component& component_utf8) {
+  if (component_utf8.len == -1)
+    return url_parse::Component();
+
   string before_component_string = text_utf8.substr(0, component_utf8.begin);
   string component_string = text_utf8.substr(component_utf8.begin,
                                              component_utf8.len);
   wstring before_component_string_w = UTF8ToWide(before_component_string);
   wstring component_string_w = UTF8ToWide(component_string);
   url_parse::Component component_w(before_component_string_w.length(),
                                    component_string_w.length());
   return component_w;
 }
 
@@ skipping 480 matching lines @@
 }
 wstring URLFixerUpper::FixupURL(const wstring& text,
                                 const wstring& desired_tld) {
   return UTF8ToWide(FixupURL(WideToUTF8(text), WideToUTF8(desired_tld)));
 }
 wstring URLFixerUpper::FixupRelativeFile(const wstring& base_dir,
                                          const wstring& text) {
   return UTF8ToWide(FixupRelativeFile(FilePath::FromWStringHack(base_dir),
                                       FilePath::FromWStringHack(text)));
 }