Skip to content

Further crash fixes to ReactImage lifetime with downloading Images #2822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Jul 24, 2019
Merged

Further crash fixes to ReactImage lifetime with downloading Images #2822

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29079a
need more conditioning around all *this access
ahimberg Jul 24, 2019
9a724a7
Merge branch 'master' into imageLoadCompletedCrash2
ahimberg Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions vnext/ReactUWP/Views/Image/ReactImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ winrt::fire_and_forget ReactImage::Source(ImageSource source) {
winrt::hstring scheme{uri.SchemeName()};
bool needsDownload = (scheme == L"http") || (scheme == L"https");
bool inlineData = scheme == L"data";
// get weak reference before any co_await calls
auto weak_this{get_weak()};

try {
m_imageSource = source;
// get weak reference before any co_await calls
auto weak_this{get_weak()};

winrt::InMemoryRandomAccessStream memoryStream;
if (needsDownload) {
Expand All @@ -83,35 +83,38 @@ winrt::fire_and_forget ReactImage::Source(ImageSource source) {
memoryStream = co_await GetImageInlineDataAsync(source);
}

if ((needsDownload || inlineData) && !memoryStream) {
m_onLoadEndEvent(*this, false);
}
if (auto strong_this{weak_this.get()}) {
if ((needsDownload || inlineData) && !memoryStream) {
strong_this->m_onLoadEndEvent(*strong_this, false);
}

if (!needsDownload || memoryStream) {
auto surface = needsDownload || inlineData
? winrt::LoadedImageSurface::StartLoadFromStream(memoryStream)
: winrt::LoadedImageSurface::StartLoadFromUri(uri);

m_surfaceLoadedRevoker = surface.LoadCompleted(
winrt::auto_revoke,
[weak_this, surface](
winrt::LoadedImageSurface const & /*sender*/,
winrt::LoadedImageSourceLoadCompletedEventArgs const &args) {
if (auto strong_this{weak_this.get()}) {
bool succeeded{false};
if (args.Status() ==
winrt::LoadedImageSourceLoadStatus::Success) {
strong_this->m_brush->Source(surface);
succeeded = true;
if (!needsDownload || memoryStream) {
auto surface = needsDownload || inlineData
? winrt::LoadedImageSurface::StartLoadFromStream(memoryStream)
: winrt::LoadedImageSurface::StartLoadFromUri(uri);

strong_this->m_surfaceLoadedRevoker = surface.LoadCompleted(
winrt::auto_revoke,
[weak_this, surface](
winrt::LoadedImageSurface const & /*sender*/,
winrt::LoadedImageSourceLoadCompletedEventArgs const &args) {
if (auto strong_this{weak_this.get()}) {
bool succeeded{false};
if (args.Status() ==
winrt::LoadedImageSourceLoadStatus::Success) {
strong_this->m_brush->Source(surface);
succeeded = true;
}
strong_this->m_onLoadEndEvent(*strong_this, succeeded);
}
strong_this->m_onLoadEndEvent(*strong_this, succeeded);
}
});
});
}
}
} catch (winrt::hresult_error const &) {
m_onLoadEndEvent(*this, false);
if (auto strong_this{weak_this.get()})
strong_this->m_onLoadEndEvent(*strong_this, false);
}
}
} // namespace uwp

winrt::IAsyncOperation<winrt::InMemoryRandomAccessStream> GetImageStreamAsync(
ImageSource source) {
Expand Down