2 files changed, 32 insertions, 21 deletions

diff --git a/lib/ic/c_src/oe_ei_decode_wstring.c b/lib/ic/c_src/oe_ei_decode_wstring.c
index 5b676fd579..d2a8270291 100644
--- a/lib/ic/c_src/oe_ei_decode_wstring.c
+++ b/lib/ic/c_src/oe_ei_decode_wstring.c
@@ -76,10 +76,12 @@ int oe_ei_decode_wstring(const char *buf, int *index, CORBA_wchar *p) {
     if (p) { /* Decoding part */
       
       /* Allocate temporary string */
-      tmp_space = (char*) malloc(length*(__OE_WCHARSZ__+1));
+      tmp_space = (char*) malloc((length + 1)*sizeof(char));
 
-      if ((error_code = ei_decode_string(buf, index, tmp_space)) < 0)
-	return error_code;
+      if ((error_code = ei_decode_string(buf, index, tmp_space)) < 0) {
+          free(tmp_space);
+          return error_code;
+      }
       
       /* Assign characters to wide characters */
       for(tmp = 0; tmp < length; tmp++)
@@ -88,7 +90,7 @@ int oe_ei_decode_wstring(const char *buf, int *index, CORBA_wchar *p) {
       p[tmp] = 0; /* Wide NULL */
       
       /* Free temporary string */
-      CORBA_free(tmp_space);
+      free(tmp_space);
 
     } else { /* Allocation counting part */
       
diff --git a/lib/ic/c_src/oe_ei_encode_atom.c b/lib/ic/c_src/oe_ei_encode_atom.c
index 758586d1d4..9d2c1d5aa3 100644
--- a/lib/ic/c_src/oe_ei_encode_atom.c
+++ b/lib/ic/c_src/oe_ei_encode_atom.c
@@ -20,28 +20,37 @@
  */
 #include <ic.h>
 
+#include <string.h>
+
+
+#define DIRTY_ATOM_ENC_MAX(LATIN1_CHARS) ((LATIN1_CHARS)*2 + 3)
+
 
 int oe_ei_encode_atom(CORBA_Environment *ev, const char *p) { 
   int size = ev->_iout;
+  size_t len = strlen(p);
+
+  if (size + DIRTY_ATOM_ENC_MAX(len) >= ev->_outbufsz) {
+
+      ei_encode_atom_len(0,&size,p,len);
+
+      if (size >= ev->_outbufsz) {
+        char *buf = ev->_outbuf;
+        int bufsz = ev->_outbufsz + ev->_memchunk;
+
+        while (size >= bufsz)
+          bufsz += ev->_memchunk;
+
+        if ((buf = realloc(buf, bufsz)) == NULL) {
+          CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
+          return -1;  /* OUT OF MEMORY */
+        }
 
-  ei_encode_atom(0,&size,p);
-
-  if (size >= ev->_outbufsz) {
-    char *buf = ev->_outbuf;
-    int bufsz = ev->_outbufsz + ev->_memchunk;
-    
-    while (size >= bufsz)
-      bufsz += ev->_memchunk;
-    
-    if ((buf = realloc(buf, bufsz)) == NULL) {
-      CORBA_exc_set(ev, CORBA_SYSTEM_EXCEPTION, NO_MEMORY, "End of heap memory while encoding");
-      return -1;  /* OUT OF MEMORY */ 
-    }
-
-    ev->_outbuf = buf;
-    ev->_outbufsz = bufsz;
+        ev->_outbuf = buf;
+        ev->_outbufsz = bufsz;
+      }
   }
 
-  return ei_encode_atom(ev->_outbuf,&ev->_iout,p);
+  return ei_encode_atom_len(ev->_outbuf,&ev->_iout,p,len);
 }