RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix possible crash in auth session destruction.

This commit is contained in:
John Preston 2019-06-17 13:54:00 +02:00
parent e7bdcc4155
commit d9e93fb5cc
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/apiwrap.cpp
View File

@ -248,6 +248,10 @@ ApiWrap::ApiWrap(not_null<AuthSession*> session)
}); });
} }
AuthSession &ApiWrap::session() const {
return *_session;
}
void ApiWrap::setupSupportMode() { void ApiWrap::setupSupportMode() {
if (!_session->supportMode()) { if (!_session->supportMode()) {
return; return;

4
Telegram/SourceFiles/apiwrap.h
View File

@ -99,7 +99,9 @@ public:
bool operator!=(const BlockedUsersSlice &other) const; bool operator!=(const BlockedUsersSlice &other) const;
}; };
ApiWrap(not_null<AuthSession*> session); explicit ApiWrap(not_null<AuthSession*> session);
AuthSession &session() const;
void applyUpdates(const MTPUpdates &updates, uint64 sentMessageRandomId = 0); void applyUpdates(const MTPUpdates &updates, uint64 sentMessageRandomId = 0);
void applyNotifySettings( void applyNotifySettings(

17
Telegram/SourceFiles/storage/file_download.cpp
View File

@ -171,6 +171,10 @@ FileLoader::FileLoader(
Expects(!_filename.isEmpty() || (_size <= Storage::kMaxFileInMemory)); Expects(!_filename.isEmpty() || (_size <= Storage::kMaxFileInMemory));
} }
AuthSession &FileLoader::session() const {
return _downloader->api().session();
}
void FileLoader::finishWithBytes(const QByteArray &data) { void FileLoader::finishWithBytes(const QByteArray &data) {
_data = data; _data = data;
_localStatus = LocalStatus::Loaded; _localStatus = LocalStatus::Loaded;
@ -411,7 +415,7 @@ void FileLoader::loadLocal(const Storage::Cache::Key &key) {
std::move(image)); std::move(image));
}); });
}; };
Auth().data().cache().get(key, [=, callback = std::move(done)]( session().data().cache().get(key, [=, callback = std::move(done)](
QByteArray &&value) mutable { QByteArray &&value) mutable {
if (readImage) { if (readImage) {
crl::async([ crl::async([
@ -478,6 +482,7 @@ void FileLoader::cancel(bool fail) {
removeFromQueue(); removeFromQueue();
const auto queue = _queue; const auto queue = _queue;
const auto sessionGuard = &session();
const auto weak = make_weak(this); const auto weak = make_weak(this);
if (fail) { if (fail) {
emit failed(this, started); emit failed(this, started);
@ -488,7 +493,9 @@ void FileLoader::cancel(bool fail) {
_filename = QString(); _filename = QString();
_file.setFileName(_filename); _file.setFileName(_filename);
} }
LoadNextFromQueue(queue);
// Current cancel() call could be made from ~AuthSession().
crl::on_main(sessionGuard, [=] { LoadNextFromQueue(queue); });
} }
void FileLoader::startLoading() { void FileLoader::startLoading() {
@ -596,7 +603,7 @@ bool FileLoader::finalizeResult() {
} }
if ((_toCache == LoadToCacheAsWell) if ((_toCache == LoadToCacheAsWell)
&& (_data.size() <= Storage::kMaxFileInMemory)) { && (_data.size() <= Storage::kMaxFileInMemory)) {
Auth().data().cache().put( session().data().cache().put(
cacheKey(), cacheKey(),
Storage::Cache::Database::TaggedValue( Storage::Cache::Database::TaggedValue(
base::duplicate(_data), base::duplicate(_data),
@ -775,7 +782,7 @@ mtpRequestId mtpFileLoader::sendRequest(const RequestData &requestData) {
}, [&](const StorageFileLocation &location) { }, [&](const StorageFileLocation &location) {
return MTP::send( return MTP::send(
MTPupload_GetFile( MTPupload_GetFile(
location.tl(Auth().userId()), location.tl(session().userId()),
MTP_int(offset), MTP_int(offset),
MTP_int(limit)), MTP_int(limit)),
rpcDone(&mtpFileLoader::normalPartLoaded), rpcDone(&mtpFileLoader::normalPartLoaded),
@ -1053,7 +1060,7 @@ bool mtpFileLoader::normalPartFailed(
} }
if (error.code() == 400 if (error.code() == 400
&& error.type().startsWith(qstr("FILE_REFERENCE_"))) { && error.type().startsWith(qstr("FILE_REFERENCE_"))) {
Auth().api().refreshFileReference( session().api().refreshFileReference(
_origin, _origin,
this, this,
requestId, requestId,

3
Telegram/SourceFiles/storage/file_download.h
View File

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "data/data_file_origin.h" #include "data/data_file_origin.h"
class ApiWrap; class ApiWrap;
class AuthSession;
namespace Storage { namespace Storage {
namespace Cache { namespace Cache {
@ -107,6 +108,8 @@ public:
bool autoLoading, bool autoLoading,
uint8 cacheTag); uint8 cacheTag);
AuthSession &session() const;
bool finished() const { bool finished() const {
return _finished; return _finished;
} }