Commit 92dc1a6
[skia-sync] Merge upstream chrome/m153 bug fixes (#350)
[skia-sync] Merge upstream chrome/m153 bug fixes (#350)
Requires: mono/SkiaSharp#4927
Changes: ca4e52c...d87457d
Merge the Chrome M153 use-after-free fix into the SkiaSharp fork.
SkCachedData::internalUnref could delete its owning object before the
AutoMutexWritable guard released the object's mutex. Store the unref result,
destroy the guard, and only then delete the object, preventing the mutex from
being unlocked through freed memory.
The reviewed range changes only src/core/SkCachedData.cpp and requires no fork
conflict resolution. Preserve its two-parent ancestry by selecting
**Create a merge commit**; do not squash or rebase this PR.
Co-authored-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>1 file changed
Lines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
69 | 74 | | |
70 | 75 | | |
71 | 76 | | |
| |||
0 commit comments