From 3d99c1cbbabd5b0fb2f3e51d1ab40a319614fca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 30 May 2012 03:55:37 +0200 Subject: [PATCH] Fix segfault in IMAP folder parsing Thanks to Francois Andriot for the patch! (cherry picked from commit 9b43d6e1802a64d4510d5c217eedef0c5d4cc6ff) --- kioslaves/imap4/imapparser.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index cb3ac21e..da1052a1 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -1354,10 +1354,10 @@ void imapParser::parseBody (parseString & inWords) label = parseOneWordC (inWords); } - if (inWords[0] == ')') + if (!inWords.isEmpty () && inWords[0] == ')') inWords.pos++; } - if (inWords[0] == ']') + if (!inWords.isEmpty () && inWords[0] == ']') inWords.pos++; skipWS (inWords); @@ -1479,6 +1479,7 @@ void imapParser::parseFetch (ulong /* value */, parseString & inWords) { TQCString word = parseLiteralC(inWords, false, true); + if(!word.isEmpty()) { switch (word[0]) { case 'E': @@ -1602,6 +1603,9 @@ void imapParser::parseFetch (ulong /* value */, parseString & inWords) parseLiteralC(inWords); break; } + } else { + parseLiteralC(inWords); + } } }