Fix crash in CanFindIntranetURL() due to FixupUserInput() changing the AutocompleteInput's text_ ...

chrome/browser/autocomplete/history_provider.cc

 // Copyright (c) 2011 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 "chrome/browser/autocomplete/history_url_provider.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 42 matching lines @@
         matches_.erase(i);
       }
       break;
     }
   }
   DCHECK(found) << "Asked to delete a URL that isn't in our set of matches";
   listener_->OnProviderUpdate(true);
 }
 
 // static
-string16 HistoryProvider::FixupUserInput(const AutocompleteInput& input) {
-  const string16& input_text = input.text();
+bool HistoryProvider::FixupUserInput(AutocompleteInput* input) {
+  const string16& input_text = input->text();
   // Fixup and canonicalize user input.
+  // NOTE: This purposefully doesn't take input.desired_tld() into account; if
+  // it did, then holding "ctrl" would change all the results from the provider,
+  // not just the What You Typed Result.
   const GURL canonical_gurl(URLFixerUpper::FixupURL(UTF16ToUTF8(input_text),
                                                     std::string()));
   std::string canonical_gurl_str(canonical_gurl.possibly_invalid_spec());
   if (canonical_gurl_str.empty()) {
     // This probably won't happen, but there are no guarantees.
-    return input_text;
+    return false;
   }
 
   // If the user types a number, GURL will convert it to a dotted quad.
   // However, if the parser did not mark this as a URL, then the user probably
   // didn't intend this interpretation.  Since this can break history matching
   // for hostname beginning with numbers (e.g. input of "17173" will be matched
   // against "0.0.67.21" instead of the original "17173", failing to find
   // "17173.com"), swap the original hostname in for the fixed-up one.
-  if ((input.type() != AutocompleteInput::URL) &&
+  if ((input->type() != AutocompleteInput::URL) &&
       canonical_gurl.HostIsIPAddress()) {
     std::string original_hostname =
-        UTF16ToUTF8(input_text.substr(input.parts().host.begin,
-                                      input.parts().host.len));
+        UTF16ToUTF8(input_text.substr(input->parts().host.begin,
+                                      input->parts().host.len));
     const url_parse::Parsed& parts =
         canonical_gurl.parsed_for_possibly_invalid_spec();
     // parts.host must not be empty when HostIsIPAddress() is true.
     DCHECK(parts.host.is_nonempty());
     canonical_gurl_str.replace(parts.host.begin, parts.host.len,
                                original_hostname);
   }
   string16 output = UTF8ToUTF16(canonical_gurl_str);
   // Don't prepend a scheme when the user didn't have one.  Since the fixer
   // upper only prepends the "http" scheme, that's all we need to check for.
@@ skipping 23 matching lines @@
   const size_t last_output_nonslash =
       output.find_last_not_of(ASCIIToUTF16("/\\"));
   const size_t num_output_slashes =
       (last_output_nonslash == string16::npos) ?
       output.length() : (output.length() - 1 - last_output_nonslash);
   if (num_output_slashes < num_input_slashes)
     output.append(num_input_slashes - num_output_slashes, '/');
   else if (num_output_slashes > num_input_slashes)
     output.erase(output.length() - num_output_slashes + num_input_slashes);
 
-  return output;
+  url_parse::Parsed parts;
+  URLFixerUpper::SegmentURL(output, &parts);
+  input->UpdateText(output, parts);
+  return !output.empty();
 }
 
 // static
 size_t HistoryProvider::TrimHttpPrefix(string16* url) {
   // Find any "http:".
   if (!HasHTTPScheme(*url))
     return 0;
   size_t scheme_pos =
       url->find(ASCIIToUTF16(chrome::kHttpScheme) + char16(':'));
   DCHECK_NE(string16::npos, scheme_pos);
 
   // Erase scheme plus up to two slashes.
   size_t prefix_end = scheme_pos + strlen(chrome::kHttpScheme) + 1;
   const size_t after_slashes = std::min(url->length(), prefix_end + 2);
   while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))
     ++prefix_end;
   url->erase(scheme_pos, prefix_end - scheme_pos);
   return (scheme_pos == 0) ? prefix_end : 0;
 }
 
 // static
 bool HistoryProvider::PreventInlineAutocomplete(
     const AutocompleteInput& input) {
   return input.prevent_inline_autocomplete() ||
         (!input.text().empty() &&
          IsWhitespace(input.text()[input.text().length() - 1]));
 }