From 5f623e32c4983eed1436fb607d6ace0be91d2378 Mon Sep 17 00:00:00 2001 From: Vladimir Golovnev Date: Thu, 13 Jan 2022 09:36:08 +0300 Subject: [PATCH] Correctly handle XML parsing errors PR #16071. --- src/base/rss/rss_parser.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/base/rss/rss_parser.cpp b/src/base/rss/rss_parser.cpp index a1ff641b8..4adbdf239 100644 --- a/src/base/rss/rss_parser.cpp +++ b/src/base/rss/rss_parser.cpp @@ -591,16 +591,16 @@ void Parser::parse_impl(const QByteArray &feedData) xml.skipCurrentElement(); } - if (!foundChannel) - { - m_result.error = tr("Invalid RSS feed."); - } - else if (xml.hasError()) + if (xml.hasError()) { m_result.error = tr("%1 (line: %2, column: %3, offset: %4).") .arg(xml.errorString()).arg(xml.lineNumber()) .arg(xml.columnNumber()).arg(xml.characterOffset()); } + else if (!foundChannel) + { + m_result.error = tr("Invalid RSS feed."); + } emit finished(m_result); m_result.articles.clear(); // clear articles only