From e702232e97896d6c0d1fa82049965704a0e06f7a Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sat, 16 Sep 2006 11:01:33 +0000 Subject: [PATCH] Handle empty MIME data portion. --- lib/silcutil/silcbuffmt.h | 2 +- lib/silcutil/silcmime.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/silcutil/silcbuffmt.h b/lib/silcutil/silcbuffmt.h index feb4754e..339459ce 100644 --- a/lib/silcutil/silcbuffmt.h +++ b/lib/silcutil/silcbuffmt.h @@ -165,7 +165,7 @@ int silc_buffer_unformat_vp(SilcBuffer src, va_list ap); * * EXAMPLE * - * ret = silc_buffer_strformat(buffer, "foo", "bar", SILC_STR_END); + * ret = silc_buffer_strformat(buffer, "foo", "bar", SILC_STRFMT_END); * if (ret < 0) * error; * diff --git a/lib/silcutil/silcmime.c b/lib/silcutil/silcmime.c index 211b36c3..1ea22ab8 100644 --- a/lib/silcutil/silcmime.c +++ b/lib/silcutil/silcmime.c @@ -283,10 +283,11 @@ SilcMime silc_mime_decode(SilcMime mime, const unsigned char *data, } } else { /* Get data area */ - if (i >= data_len) + if (i > data_len) i = 0; SILC_LOG_DEBUG(("Data len %d", data_len - i)); - silc_mime_add_data(mime, tmp + i, data_len - i); + if (i != data_len) + silc_mime_add_data(mime, tmp + i, data_len - i); } return mime; -- 2.24.0