* This is the MIME parser for Citadel.
*
* Copyright (c) 1998-2010 by the citadel.org development team.
- * This code is distributed under the GNU General Public License v3.
*
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdlib.h>
strcpy(encoding, "");
if (!strcasecmp(encoding, "binary"))
strcpy(encoding, "");
+ if (!strcasecmp(encoding, "ISO-8859-1"))
+ strcpy(encoding, "");
/* If this part is not encoded, send as-is */
if ( (strlen(encoding) == 0) || (dont_decode)) {
if (!isspace(buf[0]) && (headerlen > 0)) {
if (!strncasecmp(header, "Content-type:", 13)) {
memcpy (m->b[content_type].Key, &header[13], headerlen - 12);
+ m->b[content_type].Key[headerlen - 12] = '\0';
m->b[content_type].len = striplt (m->b[content_type].Key);
m->b[content_type_name].len = extract_key(m->b[content_type_name].Key, CKEY(m->b[content_type]), HKEY("name"), '=');
}
else if (!strncasecmp(header, "Content-Disposition:", 20)) {
memcpy (m->b[disposition].Key, &header[20], headerlen - 19);
+ m->b[disposition].Key[headerlen - 19] = '\0';
m->b[disposition].len = striplt(m->b[disposition].Key);
m->b[content_disposition_name].len = extract_key(m->b[content_disposition_name].Key, CKEY(m->b[disposition]), HKEY("name"), '=');
m->b[disposition].len = striplt(m->b[disposition].Key);
}
else if (!strncasecmp(header, "Content-ID:", 11)) {
- memcpy(m->b[id].Key, &header[11], headerlen);
+ memcpy(m->b[id].Key, &header[11], headerlen - 11);
+ m->b[id].Key[headerlen - 11] = '\0';
striplt(m->b[id].Key);
m->b[id].len = stripallbut(m->b[id].Key, '<', '>');
}
}
else if (!strncasecmp(header, "Content-transfer-encoding: ", 26)) {
memcpy(m->b[encoding].Key, &header[26], headerlen - 26);
+ m->b[encoding].Key[headerlen - 26] = '\0';
m->b[encoding].len = striplt(m->b[encoding].Key);
}
*header = '\0';
srch = next_boundary = NULL;
- for (srch = memchr(ptr, '-', content_end - srch);
+ for (srch = memchr(ptr, '-', content_end - ptr);
(srch != NULL) && (srch < content_end);
srch = memchr(srch, '-', content_end - srch))
{
/* Figure out where the boundaries are */
m->b[startary].len = snprintf(m->b[startary].Key, SIZ, "--%s", m->b[boundary].Key);
SubMimeHeaders = InitInterestingMimes ();
- if (*ptr == '\r')
- ptr ++;
- if (*ptr == '\n')
- ptr ++;
+
+ while ((*ptr == '\r') || (*ptr == '\n')) ptr ++;
+
if (strncmp(ptr, m->b[startary].Key, m->b[startary].len) == 0)
ptr += m->b[startary].len;
- if (*ptr == '\r')
- ptr ++;
- if (*ptr == '\n')
- ptr ++;
+
+ while ((*ptr == '\r') || (*ptr == '\n')) ptr ++;
+
part_start = NULL;
do {
char *optr;
if (next_boundary != NULL) {
/* If we pass out of scope, don't attempt to
* read past the end boundary. */
- if ((*(next_boundary + m->b[startary].len + 1) == '-') &&
- (*(next_boundary + m->b[startary].len + 2) == '-') ){
+ if ((*(next_boundary + m->b[startary].len) == '-') &&
+ (*(next_boundary + m->b[startary].len + 1) == '-') ){
ptr = content_end;
}
else {