[uim] r7315 committed - * gtk2/immodule/compose.c...

[codesite-noreply]

Revision: 7315
Author:   nogu.dev
Date:     Sun Sep 18 23:31:11 2011
Log:      * gtk2/immodule/compose.c
  - (im_uim_create_compose_tree): Plug leak.
* qt4/immodule/quiminputcontext_compose.cpp
  - (QUimInputContext::create_compose_tree): Ditto.
* qt3/immodule/quiminputcontext_compose.cpp
  - (QUimInputContext::create_compose_tree): Ditto.
* xim/compose.cpp
  - (XimIM::create_compose_tree): Ditto.
http://code.google.com/p/uim/source/detail?r=7315
Modified:
 /trunk/gtk2/immodule/compose.c
 /trunk/qt3/immodule/quiminputcontext_compose.cpp
 /trunk/qt4/immodule/quiminputcontext_compose.cpp
 /trunk/xim/compose.cpp

=======================================
--- /trunk/gtk2/immodule/compose.c      Tue May 24 07:44:08 2011
+++ /trunk/gtk2/immodule/compose.c      Sun Sep 18 23:31:11 2011
@@ -730,8 +730,11 @@
        }
     }

-    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name)))
+    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name))) {
+        if (fp)
+            fclose(fp);
        return;
+    }

     if (fp == NULL && ((fp = fopen(name, "r")) == NULL))
        return;
=======================================
--- /trunk/qt3/immodule/quiminputcontext_compose.cpp	Tue May 24 07:49:05  
2011
+++ /trunk/qt3/immodule/quiminputcontext_compose.cpp	Sun Sep 18 23:31:11  
2011
@@ -872,8 +872,11 @@
        }
     }

-    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name)))
+    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name))) {
+        if (fp)
+            fclose(fp);
        return;
+    }

     if (fp == NULL && ((fp = fopen(name, "r")) == NULL))
        return;
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.cpp	Thu Jan  6 18:09:56  
2011
+++ /trunk/qt4/immodule/quiminputcontext_compose.cpp	Sun Sep 18 23:31:11  
2011
@@ -874,8 +874,11 @@
         }
     }

-    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name)))
+    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name))) {
+        if (fp)
+            fclose(fp);
         return;
+    }

     if (fp == 0 && ((fp = fopen(name, "r")) == 0))
         return;
=======================================
--- /trunk/xim/compose.cpp      Sun Jun 26 21:07:37 2011
+++ /trunk/xim/compose.cpp      Sun Sep 18 23:31:11 2011
@@ -692,8 +692,11 @@
        }
     }

-    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name)))
+    if (name[0] == '\0' && !get_compose_filename(name, sizeof(name))) {
+        if (fp)
+            fclose(fp);
        return;
+    }

     if (fp == NULL && ((fp = fopen(name, "r")) == NULL))
        return;