From cd55b657c21ff5e35d8abe7009195a6a858323a5 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Sat, 25 Oct 2014 16:22:40 +0200 Subject: [PATCH] mime decode: improve MimeDecParseLineTest01 and MimeDecParseLineTest02 tests --- src/mime-decode.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/mime-decode.c b/src/mime-decode.c index f2f9d24a50..771cfe6d91 100644 --- a/src/mime-decode.c +++ b/src/mime-decode.c @@ -2620,26 +2620,29 @@ static int MimeDecParseLineTest01(void) { TestDataChunkCallback); char *str = "From: Sender1"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "To: Recipient1"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "Content-Type: text/plain"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = ""; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "A simple message line 1"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "A simple message line 2"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "A simple message line 3"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); + if (ret != MIME_DEC_OK) { + return ret; + } /* Completed */ ret = MimeDecParseComplete(state); if (ret != MIME_DEC_OK) { @@ -2684,24 +2687,27 @@ static int MimeDecParseLineTest02(void) { TestDataChunkCallback); char *str = "From: Sender1"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "To: Recipient1"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "Content-Type: text/plain"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = ""; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "A simple message line 1"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); str = "A simple message line 2 click on http://www.test.com/malware.exe?" "hahah hopefully you click this link"; - ret = MimeDecParseLine((uint8_t *)str, strlen(str), state); + ret |= MimeDecParseLine((uint8_t *)str, strlen(str), state); + if (ret != MIME_DEC_OK) { + return ret; + } /* Completed */ ret = MimeDecParseComplete(state); if (ret != MIME_DEC_OK) {