gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS][android] Fixed possible infinite recursion in downloader.

Browse source 
Signed-off-by: vng <viktor.govako@gmail.com>
This commit is contained in:
vng 2021-06-04 10:14:49 +03:00 • committed by Roman Tsisyk
parent bfe401a602
commit bc3ef16d5d
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/DownloaderAdapter.cpp
View file

@ -97,9 +97,11 @@ void BackgroundDownloaderAdapter::Download(QueuedCountry && queuedCountry)
auto urls = MakeUrlList(queuedCountry.GetRelativeUrl());
auto const path = queuedCountry.GetFileDownloadPath();
queuedCountry.OnStartDownloading();
// For safety reasons, add to the queue first and notify start downloading then,
// to avoid possible recursion.
m_queue.Append(QueuedCountry(queuedCountry));
m_queue.Append(std::move(queuedCountry));
queuedCountry.OnStartDownloading();
DownloadFromLastUrl(countryId, path, std::move(urls));
}

8
storage/background_downloading/downloader_adapter_ios.mm
View file

@ -71,9 +71,13 @@ void BackgroundDownloaderAdapter::Download(QueuedCountry && queuedCountry)
auto urls = MakeUrlList(queuedCountry.GetRelativeUrl());
auto const path = queuedCountry.GetFileDownloadPath();
queuedCountry.OnStartDownloading();
// The order is important here: add to the queue first, notify start downloading then.
// Infinite recursion possible here, otherwise:
// OnStartDownloading -> NotifyStatusChanged -> processCountryEvent -> configDialog (?!)
// -> downloadNode for the same country if autodownload enabled -> Download.
m_queue.Append(QueuedCountry(queuedCountry));
m_queue.Append(std::move(queuedCountry));
queuedCountry.OnStartDownloading();
DownloadFromLastUrl(countryId, path, std::move(urls));
}