From af393b2afe7b91392448d144c23b97b83d0382e4 Mon Sep 17 00:00:00 2001 From: bagyenda <> Date: Mon, 9 Feb 2009 08:48:56 +0000 Subject: [PATCH] *** empty log message *** --- mbuni/ChangeLog | 2 ++ mbuni/mmlib/mms_msg.c | 8 ++++++++ mbuni/mmsc/mmsc.c | 1 - mbuni/mmsc/mmsmobilesender.c | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog index 4173e43..fcb1d16 100644 --- a/mbuni/ChangeLog +++ b/mbuni/ChangeLog @@ -1,3 +1,5 @@ +2009-02-09 P. A. Bagyenda + * Fix crash when message format is invalid 2009-02-03 P. A. Bagyenda * Fix: url replacement in SMIL * Fix: sendmms port setup bug in mmsbox diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c index 2e2a860..967e6f8 100644 --- a/mbuni/mmlib/mms_msg.c +++ b/mbuni/mmlib/mms_msg.c @@ -108,6 +108,14 @@ static int decode_multipart(ParseContext *context, List *body) hlen = parse_get_uintvar(context); dlen = parse_get_uintvar(context); + if (hlen < 0 || dlen < 0) { + int pleft = parse_octets_left(context); + mms_warning(0, NULL, NULL, "Parse error reading mime body [hlen=%d, dlen=%d, left=%d]!", + hlen,dlen, pleft); + mime_entity_destroy(x); + return -1; + } + parse_limit(context, hlen); hs = parse_get_octets(context, parse_octets_left(context)); diff --git a/mbuni/mmsc/mmsc.c b/mbuni/mmsc/mmsc.c index 2aae74e..4c57a77 100644 --- a/mbuni/mmsc/mmsc.c +++ b/mbuni/mmsc/mmsc.c @@ -35,7 +35,6 @@ int main(int argc, char *argv[]) { int cfidx; Octstr *fname; - long r_thread = 0; mms_lib_init(); diff --git a/mbuni/mmsc/mmsmobilesender.c b/mbuni/mmsc/mmsmobilesender.c index 9c3245b..38af8fc 100644 --- a/mbuni/mmsc/mmsmobilesender.c +++ b/mbuni/mmsc/mmsmobilesender.c @@ -78,7 +78,7 @@ static void do_mm1_push(Octstr *rcpt_to, int isphonenum, MmsEnvelope *e, MmsMsg octstr_append_char(pduhdr, 0xbe); /* content type. */ #else octstr_append_char(pduhdr, - 1 + 1 + sizeof "application/vnd.wap.mms-message"); /*header length. */ + 1 + 1 + strlen("application/vnd.wap.mms-message") + 1); /*header length. */ octstr_append_cstr(pduhdr, "application/vnd.wap.mms-message"); octstr_append_char(pduhdr, 0x0); /* string terminator. */ #endif