commit d3f79b8e0ddf82e7740c0baddab734fcc4293f52
author Leon Scroggins III <scroggo@google.com> Mon Oct 22 13:16:37 2018 -0400
committer Max Spector <mspector@google.com> Tue Dec 04 13:55:35 2018 -0800
tree 5c0c7cf0e43fb847891ac09fea67dd0ca50277a4
parent 2d4f37eb41e8a4c13db3353b1fb6fabae00c025f

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
Note: SafetyNet logging code revised since the actual API is missing,
but it's functionally identical

Test: run cts -m CtsSecurityTestCases -t android.security.cts.BitmapFactorySecurityTests#test_android_bug_118143775

Change-Id: Ie476a0191b66c2322446b9c0922f630d6e971645
(cherry picked from commit 8adcfda1344480c277f8f3dc3e76ff4c119a80a7)