[uim] r7403 committed - * Merge r7320 from trunk.

[codesite-noreply]

Revision: 7403
Author:   ek.kato
Date:     Tue Jan 10 22:39:26 2012
Log:      * Merge r7320 from trunk.

http://code.google.com/p/uim/source/detail?r=7403

Modified:
 /branches/1.7/helper/dict-canna.c
 /branches/1.7/helper/dict-word-win-gtk.c

=======================================
--- /branches/1.7/helper/dict-canna.c   Sun Jun 12 05:55:58 2011
+++ /branches/1.7/helper/dict-canna.c   Tue Jan 10 22:39:26 2012
@@ -158,6 +158,8 @@
   phon = strdup(buf);

   for (;;) {
+    if (!p)
+      break;
     q = strchr(p, ' ');
     if (q) {
       *q = '\0';
@@ -309,6 +311,8 @@

   if (status == -2) {
     if (dict_canna_create_priv_dic() < 0) {
+      free(dict->identifier);
+      free(dict->charset);
       free(dict);
       RkFinalize();
       return NULL;
=======================================
--- /branches/1.7/helper/dict-word-win-gtk.c    Fri Feb 11 22:21:43 2011
+++ /branches/1.7/helper/dict-word-win-gtk.c    Tue Jan 10 22:39:26 2012
@@ -495,7 +495,7 @@
     g_free(phonetic);
     g_free(literal);
     g_free(cclass_desc);
-    g_free(word);
+    free(word);
 #endif
   } else {
     ret = 0;