updates

[crypto.git] / lib / silcutil / silcstrutil.c

diff --git a/lib/silcutil/silcstrutil.c b/lib/silcutil/silcstrutil.c
index f15d07863d4fdc641a151520e6b2d59c85372d09..5e6a592bce8484a37205d71c0379ba098f86217f 100644 (file)
--- a/lib/silcutil/silcstrutil.c
+++ b/lib/silcutil/silcstrutil.c
@@ -187,6 +187,11 @@ SilcUInt32 silc_utf8_encode(const unsigned char *bin, SilcUInt32 bin_len,
   if (!bin || !bin_len)
     return 0;
 
+  if (silc_utf8_valid(bin, bin_len) && bin_len <= utf8_size) {
+    memcpy(utf8, bin, bin_len);
+    return bin_len;
+  }
+
   for (i = 0; i < bin_len; i++) {
     switch (bin_encoding) {
     case SILC_STRING_ASCII:
@@ -420,13 +425,15 @@ bool silc_utf8_valid(const unsigned char *utf8, SilcUInt32 utf8_len)
 #define MIME_GET_FIELD(header, mime, mime_len, field, field_len,       \
                       dest, dest_size)                                 \
 do {                                                                   \
-  char *f = strstr(header, field);                                     \
-  if (f && dest) {                                                     \
-    f = (char *)mime + (f - header) + field_len;                       \
-    for (i = 0; i < (mime_len - (f - (char *)mime)); i++) {            \
-      if (f[i] == '\r' || f[i] == '\n' || i == dest_size)              \
-        break;                                                         \
-      dest[i] = f[i];                                                  \
+  if (dest) {                                                          \
+    char *f = strstr(header, field);                                   \
+    if (f) {                                                           \
+      f = (char *)mime + (f - header) + field_len;                     \
+      for (i = 0; i < (mime_len - (f - (char *)mime)); i++) {          \
+        if (f[i] == '\r' || f[i] == '\n' || i == dest_size)            \
+          break;                                                       \
+        dest[i] = f[i];                                                        \
+      }                                                                        \
     }                                                                  \
   }                                                                    \
 } while(0)
@@ -441,9 +448,9 @@ silc_mime_parse(const unsigned char *mime, SilcUInt32 mime_len,
                 unsigned char **mime_data_ptr, SilcUInt32 *mime_data_len)
 { 
   int i;
-  char header[512];
+  char header[256];
    
-  memcpy(header, mime, 512 > mime_len ? mime_len : 512);
+  memcpy(header, mime, 256 > mime_len ? mime_len : 256);
   header[sizeof(header) - 1] = '\0';
 
   /* Check for mandatory Content-Type field */