[uim commit] r5146 - branches/1.4/uim

[codesite-noreply]

Author: ek.kato
Date: Tue Jan 29 01:12:53 2008
New Revision: 5146

Modified:
  branches/1.4/uim/skk.c
  branches/1.4/uim/uim.c

Log:
* uim/skk.c : Port r5145 from trunk.
* uim/uim.c : Apply patch from [EMAIL PROTECTED] (#14285).


Modified: branches/1.4/uim/skk.c
==============================================================================
--- branches/1.4/uim/skk.c      (original)
+++ branches/1.4/uim/skk.c      Tue Jan 29 01:12:53 2008
@@ -722,6 +722,7 @@

  if (read(skkservsock, &r, 1) <= 0) {
    skkserv_disconnected(di);
+    free(line);
    return NULL;
  }

@@ -730,6 +731,7 @@
      ret = read(skkservsock, &r, 1);
      if (ret <= 0) {
        skkserv_disconnected(di);
+       free(line);
        return NULL;
      }

@@ -756,6 +758,7 @@
    return sl;
  } else {
    while (read(skkservsock, &r, 1) > 0 && r != '\n');
+    free(line);
    return NULL;
  }
}

Modified: branches/1.4/uim/uim.c
==============================================================================
--- branches/1.4/uim/uim.c      (original)
+++ branches/1.4/uim/uim.c      Tue Jan 29 01:12:53 2008
@@ -123,8 +123,10 @@
    return NULL;
  }
  get_context_id(uc);
-  if (uc->id == -1)
+  if (uc->id == -1) {
+    free(uc);
    return NULL;
+  }

  uc->ptr = ptr;
  uc->is_enable = 1;