Android 7.1.1 Release 61 (5787798)
RESTRICT AUTOMERGE: Fix heap buffer overflow

Bug: b/118143775
Bug: oss-fuzz:11040

Because we're sampling, the offset ends up the same as the width. Back
up to the left enough to fit the bytes we will write.

Include SafetyNet logging from
https://skia-review.googlesource.com/c/skia/+/171227

Test: not feasible

Change-Id: Ie476a0191b66c2322446b9c0922f630d6e971645
(cherry picked from commit 07fd41b8234d40e9372604ae3779bda5d760ffc4)
1 file changed