commit | bce1a989e7bb1b5cc907b64ca5e9d103f8c3b56f | [log] [tgz] |
---|---|---|
author | Mike Reed <reed@google.com> | Fri Jun 16 11:18:23 2017 -0400 |
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Fri Jun 16 16:17:05 2017 +0000 |
tree | 42db372e439f87045c925c30594ec90d9d32585e | |
parent | 2fabc4f82ca8cd15f9b8f376377eba27bef59f6d [diff] |
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 <brianosman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-By: Mike Klein <mtklein@chromium.org> Reviewed-on: https://skia-review.googlesource.com/20147 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Mike Reed <reed@google.com>
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 @@ const void* ptr = this->skip(sizeof(SkColor4f)); if (!fError) { memcpy(color, ptr, sizeof(SkColor4f)); + } else { + *color = SkColor4f::FromColor(SK_ColorBLACK); } }