1072539 - Only ForceDiscard in imgFrame::GetFrame if it's safe to do so

Status: RESOLVED FIXED

(Core :: Graphics: ImageLib, defect)

Description

[Seth Fowler [:seth] [:s2h]]

I suspect bug 1069369's root cause is that we don't check whether it's safe to ForceDiscard() in imgFrame::GetFrame() before doing so. Let's add that check. This is a speculative fix, but I think there's good reason to believe that it will work, since the crash seems to be caused by a null value for RasterImage::mDecodeRequest, which is cleared by ForceDiscard().

Comment 1

[Seth Fowler [:seth] [:s2h]]

Attachment: Only ForceDiscard() in imgFrame::GetFrame() if it's safe to do so

Here's the patch.

Comment 2

[Seth Fowler [:seth] [:s2h]]

Here's a try job. If anyone can use the Android build to verify that this fixes bug 1069369 for them (i.e., they can consistently reproduce without this patch, but not with it) I'd appreciate it. I still can't reproduce bug 1069369 reliably.

https://tbpl.mozilla.org/?tree=Try&rev=1473dd4056fc

Comment 3

[Timothy Nikkel (:tnikkel)]

Comment on attachment 8494742 [details] [diff] [review]
Only ForceDiscard() in imgFrame::GetFrame() if it's safe to do so

Yeah, this felt a little unsafe when reviewing the original patch.

Comment 4

[Seth Fowler [:seth] [:s2h]]

Thanks for the quick review!

Try looks good, so I went ahead and pushed:

https://hg.mozilla.org/integration/mozilla-inbound/rev/5aa68330b3f0

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/5aa68330b3f0