[Chromium-reviews] Fix issue 3039/3040 (Add to dictionary crasher)

chrome/third_party/hunspell/src/hunspell/hashmgr.cxx

Index: chrome/third_party/hunspell/src/hunspell/hashmgr.cxx
===================================================================
--- chrome/third_party/hunspell/src/hunspell/hashmgr.cxx	(revision 2796)
+++ chrome/third_party/hunspell/src/hunspell/hashmgr.cxx	(working copy)
@@ -119,7 +119,6 @@
 
 #ifdef HUNSPELL_CHROME_CLIENT
   EmptyHentryCache();
-  STLDeleteValues(&custom_word_to_hentry_map_);
   for (std::vector<std::string*>::iterator it = pointer_to_strings_.begin(); 
        it != pointer_to_strings_.end(); ++it) {
     delete *it;
@@ -152,12 +151,12 @@
   int affix_ids[hunspell::BDict::MAX_AFFIXES_PER_WORD];
   int affix_count = bdict_reader->FindWord(word, affix_ids);
   if (affix_count == 0) { // look for custom added word
-    std::map<StringPiece, struct hentry *>::const_iterator iter = 
-      custom_word_to_hentry_map_.find(word);
-    if (iter != custom_word_to_hentry_map_.end())
-      return iter->second;
-    else
-      return NULL;
+    std::map<StringPiece, int>::const_iterator iter = 
+      custom_word_to_affix_id_map_.find(word);
+    if (iter != custom_word_to_affix_id_map_.end()) {
+      affix_count = 1;
+      affix_ids[0] = iter->second;
+    }
   }
 
   static const int kMaxWordLen = 128;
@@ -243,20 +242,13 @@
        dp->next = hp;
     }
 #endif  // HUNSPELL_CHROME_CLIENT
-    std::map<StringPiece, struct hentry *>::iterator iter = 
-        custom_word_to_hentry_map_.find(word);
-    if(iter == custom_word_to_hentry_map_.end()) {  // word needs to be added
-      // Make a custom hentry.
-      struct hentry* he = new hentry;
-      he->word = (char *)word;
-      he->wlen = wl;
-      he->next = NULL;
-      he->next_homonym = NULL;
-
+    std::map<StringPiece, int>::iterator iter = 
+        custom_word_to_affix_id_map_.find(word);
+    if(iter == custom_word_to_affix_id_map_.end()) {  // word needs to be added
       std::string* new_string_word = new std::string(word);
       pointer_to_strings_.push_back(new_string_word);
       StringPiece sp(*(new_string_word));
-      custom_word_to_hentry_map_[sp] = he;
+      custom_word_to_affix_id_map_[sp] = 0; // no affixes for custom words
       return 1;
     }