提交: 9a7c9789408e288e932d74518fc16e86e7bcc199 - uim (git)

A multilingual input method framework

Commit MetaInfo

• 修订版: 9a7c9789408e288e932d74518fc16e86e7bcc199 (tree)
• 时间: 2012-01-11 15:39:26
• 作者: ek.kato <ek.kato@ff9a...>
• Commiter: ek.kato

Log Message

* Merge r7320 from trunk.

更改概述

• modified: helper/dict-canna.c
• modified: helper/dict-word-win-gtk.c

差异

--- a/helper/dict-canna.c
+++ b/helper/dict-canna.c
@@ -158,6 +158,8 @@ static void parse_canna_priv_dic_buf(char *buf, uim_word **head)
   phon = strdup(buf);
 
   for (;;) {
+    if (!p)
+      break;
     q = strchr(p, ' ');
     if (q) {
       *q = '\0';
@@ -309,6 +311,8 @@ uim_dict_canna_open(const char *identifier)
 
   if (status == -2) {
     if (dict_canna_create_priv_dic() < 0) {
+      free(dict->identifier);
+      free(dict->charset);
       free(dict);
       RkFinalize();
       return NULL;

--- a/helper/dict-word-win-gtk.c
+++ b/helper/dict-word-win-gtk.c
@@ -495,7 +495,7 @@ word_window_add(WordWindow *window)
     g_free(phonetic);
     g_free(literal);
     g_free(cclass_desc);
-    g_free(word);
+    free(word);
 #endif
   } else {
     ret = 0;