From bce1a989e7bb1b5cc907b64ca5e9d103f8c3b56f Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 16 Jun 2017 11:18:23 -0400 Subject: [PATCH] Fix use of uninitialized value in SkColor4Shader::CreateProc cherry-picking fix 2e425ebd95dd97f788f7f8a3b8529d77d69b4f61 No-Tree-Checks: true No-Try: true No-Presubmit: true Bug: chromium:727678 Change-Id: I4c59d9222d47b866b3c30408322ec456f304aa53 Reviewed-On: https://skia-review.googlesource.com/18938 Commit-Queue: Brian Osman Commit-Queue: Mike Klein Reviewed-By: Mike Klein Reviewed-on: https://skia-review.googlesource.com/20147 Reviewed-by: Brian Osman Commit-Queue: Mike Reed --- src/core/SkValidatingReadBuffer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/SkValidatingReadBuffer.cpp b/src/core/SkValidatingReadBuffer.cpp index 253b3f2..bb0b162 100644 --- a/src/core/SkValidatingReadBuffer.cpp +++ b/src/core/SkValidatingReadBuffer.cpp @@ -116,6 +116,8 @@ void SkValidatingReadBuffer::readColor4f(SkColor4f* color) { const void* ptr = this->skip(sizeof(SkColor4f)); if (!fError) { memcpy(color, ptr, sizeof(SkColor4f)); + } else { + *color = SkColor4f::FromColor(SK_ColorBLACK); } } -- 2.7.4