kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 19:46:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not crash if the zim file is invalid or corrupted.

Browse Source
This commit is contained in:
Matthieu Gautier 2018-06-12 19:23:30 +02:00
parent 84e5124ae6
commit 7c8d475d24
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kiwixapp.cpp
View File

@ -19,7 +19,11 @@ void KiwixApp::openZimFile(const QString &zimfile)
delete reader; delete reader;
const std::string zimfile_ = zimfile.toLocal8Bit().constData(); const std::string zimfile_ = zimfile.toLocal8Bit().constData();
std::cout << "Opening " << zimfile_ << std::endl; std::cout << "Opening " << zimfile_ << std::endl;
reader = new kiwix::Reader(zimfile_); try {
reader = new kiwix::Reader(zimfile_);
} catch (...) {
reader = nullptr;
}
} }
kiwix::Reader* KiwixApp::getReader() kiwix::Reader* KiwixApp::getReader()

4
kiwixschemehandler.cpp
View File

@ -20,6 +20,10 @@ KiwixSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
zim::Article art; zim::Article art;
std::cout << "Url is " << url << std::endl; std::cout << "Url is " << url << std::endl;
auto reader = static_cast<KiwixApp*>(KiwixApp::instance())->getReader(); auto reader = static_cast<KiwixApp*>(KiwixApp::instance())->getReader();
if ( reader == nullptr) {
request->fail(QWebEngineUrlRequestJob::UrlNotFound);
return;
}
if ( !reader->getArticleObjectByDecodedUrl(url, art)) if ( !reader->getArticleObjectByDecodedUrl(url, art))
{ {
url = "A/" + url; url = "A/" + url;