Ticket #20: charcnv.diff

lib/charcnv.c

@@ -1424 +1424 @@
     /* It cannot occupy more than 4 bytes in UTF16 format */
     uint8_t buf[4];
     smb_iconv_t descriptor;
+    size_t ilen_max;
     size_t ilen_orig;
     size_t ilen;
     size_t olen_orig;
@@ -1431 +1432 @@
     const char *inbuf;
     char *outbuf;
 
+    *size = 1;
+
     if ((str[0] & 0x80) == 0) {
-        *size = 1;
         return (codepoint_t)str[0];
     }
 
@@ -1440 +1442 @@
 
     descriptor = conv_handles[CH_UNIX][CH_UTF16LE];
     if (descriptor == (smb_iconv_t)-1 || descriptor == (smb_iconv_t)0) {
-        *size = 1;
         return INVALID_CODEPOINT;
     }
 
-    *size = 1;
+    /* 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 );
+
     ilen_orig = 1;
     olen_orig = 2;
     while( 1 )
@@ -1466 +1472 @@
                 break;
 
             case EINVAL :
-                /* 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 )
+                if( ilen_orig < ilen_max )
                     ilen_orig++;
                 else
                     return INVALID_CODEPOINT;