Changeset 120

Timestamp:

02/18/08 09:21:22 (10 months ago)

Author:

psmedley

Message:

Changes from KO to address Ticket #20

Files:

• branches/samba-3.0/source/lib/charcnv.c (modified) (4 diffs)

branches/samba-3.0/source/lib/charcnv.c

@@ -1425 +1425 @@
     uint8_t buf[4];
     smb_iconv_t descriptor;
+#ifdef __OS2__
+    size_t ilen_max;
+#endif
     size_t ilen_orig;
     size_t ilen;
@@ -1432 +1435 @@
     char *outbuf;
 
+#ifdef __OS2__
+    *size = 1;
+#endif
+
     if ((str[0] & 0x80) == 0) {
+#ifndef __OS2__
         *size = 1;
+#endif
         return (codepoint_t)str[0];
     }
@@ -1441 +1450 @@
     descriptor = conv_handles[CH_UNIX][CH_UTF16LE];
     if (descriptor == (smb_iconv_t)-1 || descriptor == (smb_iconv_t)0) {
+#ifndef __OS2__
         *size = 1;
+#endif
         return INVALID_CODEPOINT;
     }
-
+#ifdef __OS2__
+    /* We assume that no multi-byte character can take
+       more than 5 bytes. This is OK as we only
+       support codepoints up to 1M */
+
+    ilen_max = strnlen( str, 5 );
+#else
     *size = 1;
+#endif
     ilen_orig = 1;
     olen_orig = 2;
@@ -1467 +1485 @@
 
             case EINVAL :
+#ifndef __OS2__
                 /* We assume that no multi-byte character can take
                    more than 5 bytes. This is OK as we only
                    support codepoints up to 1M */
                 if( ilen_orig < 5 )
+#else
+                if( ilen_orig < ilen_max )
+#endif
                     ilen_orig++;
                 else