Changeset 3705

Timestamp:

Mar 16, 2011, 10:04:20 PM (14 years ago)

Author:

bird

Message:

iconv.c: Use malloc instead of alloca for larger strings so we don't blow up the stack. References #183.

Location:

trunk/libc/src/libc/locale/os2

Files:

• Makefile.kmk (modified) (1 diff)
• iconv.c (modified) (4 diffs)

trunk/libc/src/libc/locale/os2/Makefile.kmk ¶

@@ -1 +1 @@
 # Forward to the parent makefile.
-DEPTH = ../../../..
+DEPTH = ../../../../..
 include $(PATH_KBUILD)/up.kmk
 

trunk/libc/src/libc/locale/os2/iconv.c ¶

@@ -158 +158 @@
   size_t    nonid;
   UniChar  *ucs;
+  UniChar  *pucsFree = NULL;
   UniChar  *orig_ucs;
   size_t    retval = 0;
@@ -185 +186 @@
     }
 
-  sl =  *in_left;
-  ucs = (UniChar *) alloca (sl * sizeof (UniChar));
+  sl = *in_left;
+  if (sl <= 1024)
+    ucs = (UniChar *) alloca (sl * sizeof (UniChar));
+  else
+    {
+      pucsFree = ucs = (UniChar *) malloc (sl * sizeof (UniChar));
+      if (!ucs)
+        {
+          errno = ENOMEM;
+          return -1;
+        }
+    }
   orig_ucs = ucs;
 
@@ -220 +231 @@
     }
 #endif
+  if (pucsFree)
+      free(pucsFree);
   FS_RESTORE();
   return 0;
@@ -240 +253 @@
       break;
   }
+  if (pucsFree)
+      free(pucsFree);
   FS_RESTORE();
   return (size_t)(-1);