procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash on invalid lottie file selection.

This commit is contained in:
John Preston 2019-05-30 18:09:44 +03:00
parent 325323e0b3
commit a968e112e8
3 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/data/data_document.cpp
View File

@ -308,9 +308,6 @@ void DocumentOpenClickHandler::Open(
if (QImageReader(path).canRead()) {
Core::App().showDocument(data, context);
return;
//} else if (Lottie::ValidateFile(path)) {
// Core::App().showDocument(data, context);
// return;
}
}
LaunchWithWarning(location.name(), context);

27
Telegram/SourceFiles/lottie/lottie_animation.cpp
View File

@ -54,28 +54,13 @@ QByteArray UnpackGzip(const QByteArray &bytes) {
} // namespace
bool ValidateFile(const QString &path) {
if (!path.endsWith(qstr(".json"), Qt::CaseInsensitive)
&& !path.endsWith(qstr(".tgs"), Qt::CaseInsensitive)) {
return false;
}
return true;
}
std::unique_ptr<Animation> FromFile(const QString &path) {
if (!path.endsWith(qstr(".json"), Qt::CaseInsensitive)
&& !path.endsWith(qstr(".tgs"), Qt::CaseInsensitive)) {
return nullptr;
}
auto f = QFile(path);
if (!f.open(QIODevice::ReadOnly)) {
return nullptr;
}
const auto content = f.readAll();
if (content.isEmpty()) {
return nullptr;
}
return FromData(std::move(content));
return FromData([&] {
auto f = QFile(path);
return (f.size() <= kMaxFileSize && f.open(QIODevice::ReadOnly))
? f.readAll()
: QByteArray();
}());
}
std::unique_ptr<Animation> FromData(const QByteArray &data) {

1
Telegram/SourceFiles/lottie/lottie_animation.h
View File

@ -31,7 +31,6 @@ class Animation;
class SharedState;
class FrameRenderer;
bool ValidateFile(const QString &path);
std::unique_ptr<Animation> FromFile(const QString &path);
std::unique_ptr<Animation> FromData(const QByteArray &data);