From 590161fd805b5d9c397a5dc192996d13acdbaff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 26 Sep 2012 14:54:22 +0200 Subject: [PATCH] Fix more SEGV in imapparser Thanks to Francois Andriot for the patch This resolves Bug 1235 --- kioslaves/imap4/imapparser.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kioslaves/imap4/imapparser.cc b/kioslaves/imap4/imapparser.cc index 9e8d68c9..d7ad8697 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/kioslaves/imap4/imapparser.cc @@ -345,6 +345,7 @@ imapParser::parseUntagged (parseString & result) parseOneWordC(result); // * TQByteArray what = parseLiteral (result); // see whats coming next + if(!what.isEmpty ()) { switch (what[0]) { //the status responses @@ -482,6 +483,7 @@ imapParser::parseUntagged (parseString & result) if (valid) { what = parseLiteral (result); + if(!what.isEmpty ()) { switch (what[0]) { case 'E': @@ -520,10 +522,12 @@ imapParser::parseUntagged (parseString & result) default: break; } + } } } break; } //switch + } } //func @@ -1915,9 +1919,10 @@ TQCString imapParser::parseLiteralC(parseString & inWords, bool relay, bool stop if (!inWords.isEmpty() && inWords[0] == '{') { TQCString retVal; - ulong runLen = inWords.find ('}', 1); - if (runLen > 0) + long srunLen = inWords.find ('}', 1); // Can return -1, so use a signed long + if (srunLen > 0) { + ulong runLen = (ulong)srunLen; bool proper; ulong runLenSave = runLen + 1; TQCString tmpstr(runLen);