[uim] r7272 committed - * Merge r7271 from trunk.

[codesite-noreply]

Revision: 7272
Author:   ek.kato
Date:     Tue Aug 23 19:17:14 2011
Log:      * Merge r7271 from trunk.

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

Modified:
 /branches/1.7/uim/iconv.c

=======================================
--- /branches/1.7/uim/iconv.c   Thu Jan  6 18:09:56 2011
+++ /branches/1.7/uim/iconv.c   Tue Aug 23 19:17:14 2011
@@ -264,12 +264,14 @@
   if (UIM_CATCH_ERROR_BEGIN())
     return NULL;

-  if (!obj)
-    return uim_strdup(instr);
-
   if (!instr)
     goto err;

+  if (!obj) {
+    UIM_CATCH_ERROR_END();
+    return uim_strdup(instr);
+  }
+
   ins = strlen(instr);
   in = instr;