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

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

 #include "license.hunspell"
 #include "license.myspell"
 
 #ifndef MOZILLA_CLIENT
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
 #include <cctype>
 #else
 #include <stdlib.h> 
@@ skipping 101 matching lines @@
     for (int j = 0; j < (numaliasm); j++) free(aliasm[j]);
     free(aliasm);
     aliasm = NULL;
   }  
   
   if (ignorechars) free(ignorechars);
   if (ignorechars_utf16) free(ignorechars_utf16);
 
 #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;
   }
 #endif
 }
 
 #ifdef HUNSPELL_CHROME_CLIENT
 void HashMgr::EmptyHentryCache() {
   // We need to delete each cache entry, and each additional one in the linked
@@ skipping 12 matching lines @@
 #endif
 
 // lookup a root word in the hashtable
 
 struct hentry * HashMgr::lookup(const char *word) const
 {
 #ifdef HUNSPELL_CHROME_CLIENT
   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;
   static char word_buf[kMaxWordLen];
   strncpy(word_buf, word, kMaxWordLen);
 
   return AffixIDsToHentry(word_buf, affix_ids, affix_count);
 #else
     struct hentry * dp;
     if (tableptr) {
@@ skipping 65 matching lines @@
        }
 #endif
        while (dp->next != NULL) {
          if ((!dp->next_homonym) && (strcmp(hp->word, dp->word) == 0)) dp->next_homonym = hp;
          dp=dp->next;
        }
        if ((!dp->next_homonym) && (strcmp(hp->word, dp->word) == 0)) dp->next_homonym = hp;
        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;
     }
 
     return 0;
 }     
 
 // add a custom dic. word to the hash table (public)
 int HashMgr::put_word(const char * word, int wl, char * aff)
 {
     unsigned short * flags;
@@ skipping 658 matching lines @@
 int HashMgr::is_aliasm() {
     return (aliasm != NULL);
 }
 
 char * HashMgr::get_aliasm(int index) {
     if ((index > 0) && (index <= numaliasm)) return aliasm[index - 1];
     HUNSPELL_WARNING(stderr, "error: bad morph. alias index: %d\n", index);
     return NULL;
 }
 #endif