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

chrome/browser/autocomplete/history_url_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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
@@ skipping 516 matching lines @@
   }
   scoped_ptr<HistoryURLProviderParams> params(
       new HistoryURLProviderParams(input, trim_http, languages));
 
   params->prevent_inline_autocomplete =
       PreventInlineAutocomplete(input);
 
   if (fixup_input_and_run_pass_1) {
     // Do some fixup on the user input before matching against it, so we provide
     // good results for local file paths, input with spaces, etc.
-    // NOTE: This purposefully doesn't take input.desired_tld() into account; if
-    // it did, then holding "ctrl" would change all the results from the
-    // HistoryURLProvider provider, not just the What You Typed Result.
-    const string16 fixed_text(FixupUserInput(input));
-    if (fixed_text.empty()) {
-      // Conceivably fixup could result in an empty string (although I don't
-      // have cases where this happens offhand).  We can't do anything with
-      // empty input, so just bail; otherwise we'd crash later.
+    if (!FixupUserInput(&params->input))
       return;
-    }
-    params->input.set_text(fixed_text);
 
     // Pass 1: Get the in-memory URL database, and use it to find and promote
     // the inline autocomplete match, if any.
     history::URLDatabase* url_db = history_service->InMemoryDatabase();
     // url_db can be NULL if it hasn't finished initializing (or failed to
     // initialize).  In this case all we can do is fall back on the second
     // pass.
     //
     // TODO(pkasting): We should just block here until this loads.  Any time
     // someone unloads the history backend, we'll get inconsistent inline
@@ skipping 160 matching lines @@
   match->relevance = CalculateRelevance(input.type(), type, 0);
 
   // Put it on the front of the HistoryMatches for redirect culling.
   EnsureMatchPresent(info, string16::npos, false, matches, true);
   return true;
 }
 
 bool HistoryURLProvider::CanFindIntranetURL(
     history::URLDatabase* db,
     const AutocompleteInput& input) const {
+  // Normally passing the first two conditions below ought to guarantee the
+  // third condition, but because FixupUserInput() can run and modify the
+  // input's text and parts between Parse() and here, it seems better to be
+  // paranoid and check.
   if ((input.type() != AutocompleteInput::UNKNOWN) ||
-      !LowerCaseEqualsASCII(input.scheme(), chrome::kHttpScheme))
+      !LowerCaseEqualsASCII(input.scheme(), chrome::kHttpScheme) ||
+      !input.parts().host.is_nonempty())
     return false;
-  DCHECK(input.parts().host.is_nonempty());
   const string16 host(input.text().substr(input.parts().host.begin,
                                           input.parts().host.len));
   if (net::RegistryControlledDomainService::GetRegistryLength(
       UTF16ToUTF8(host), false) != 0)
     return false;
   std::vector<history::URLRow> dummy;
   for (history::Prefixes::const_iterator i(prefixes_.begin());
        i != prefixes_.end(); ++i) {
     if ((i->num_components == 1) &&
         (db->AutocompleteForPrefix(i->prefix + host + ASCIIToUTF16("/"), 1,
@@ skipping 182 matching lines @@
         &match.contents_class);
   }
   match.description = info.title();
   AutocompleteMatch::ClassifyMatchInString(params->input.text(),
                                            info.title(),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
 
   return match;
 }