Check word lengths before adding to dictionary and spellchecking....

chrome/browser/spellchecker.cc

 // Copyright (c) 2006-2009 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/spellchecker.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 822 matching lines @@
     SpellCheckerPlatform::AddWord(word);
     return;
   }
 
   // Check if the |hunspell_| has been initialized at all.
   Initialize();
 
   // Add the word to hunspell.
   std::string word_to_add = UTF16ToUTF8(word);
   // Don't attempt to add an empty word, or one larger than Hunspell can handle
-  if (!word_to_add.empty() && word_to_add.length() < MAXWORDUTF8LEN) {
+  if (!word_to_add.empty() && word_to_add.length() < MAXWORDLEN) {
     // Either add the word to |hunspell_|, or, if |hunspell_| is still loading,
     // defer it till after the load completes.
     if (hunspell_.get())
       hunspell_->add(word_to_add.c_str());
     else
       custom_words_.push(word_to_add);
   }
 
   // Now add the word to the custom dictionary file.
   Task* write_word_task =
       new AddWordToCustomDictionaryTask(custom_dictionary_file_name_, word);
   if (file_loop_) {
     file_loop_->PostTask(FROM_HERE, write_word_task);
   } else {
     write_word_task->Run();
     delete write_word_task;
   }
 }
 
 bool SpellChecker::CheckSpelling(const string16& word_to_check, int tag) {
   bool word_correct = false;
 
   TimeTicks begin_time = TimeTicks::Now();
   if (is_using_platform_spelling_engine_) {
     word_correct = SpellCheckerPlatform::CheckSpelling(word_to_check, tag);
   } else {
     std::string word_to_check_utf8(UTF16ToUTF8(word_to_check));
     // Hunspell shouldn't let us exceed its max, but check just in case
-    if (word_to_check_utf8.length() < MAXWORDUTF8LEN) {
+    if (word_to_check_utf8.length() < MAXWORDLEN) {
       // |hunspell_->spell| returns 0 if the word is spelled correctly and
       // non-zero otherwsie.
       word_correct = (hunspell_->spell(word_to_check_utf8.c_str()) != 0);
     }
   }
   DHISTOGRAM_TIMES("Spellcheck.CheckTime", TimeTicks::Now() - begin_time);
 
   return word_correct;
 }
 
@@ skipping 13 matching lines @@
 
   // Populate the vector of WideStrings.
   for (int i = 0; i < number_of_suggestions; i++) {
     if (i < kMaxSuggestions)
       optional_suggestions->push_back(UTF8ToUTF16(suggestions[i]));
     free(suggestions[i]);
   }
   if (suggestions != NULL)
     free(suggestions);
 }