From: Pekka Riikonen Date: Fri, 19 Apr 2002 09:26:51 +0000 (+0000) Subject: updates X-Git-Tag: silc.toolkit.0.9~40 X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=e7b42d458e102b6e6438e69cb0d1f11c53789e70;p=silc.git updates --- diff --git a/lib/silcutil/silcstrutil.c b/lib/silcutil/silcstrutil.c index f15d0786..ebc24691 100644 --- a/lib/silcutil/silcstrutil.c +++ b/lib/silcutil/silcstrutil.c @@ -420,13 +420,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 +443,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 */