Fix use of uninitialized value in SkColor4Shader::CreateProc
authorMike Reed <reed@google.com>
Fri, 16 Jun 2017 15:18:23 +0000 (11:18 -0400)
committerSkia Commit-Bot <skia-commit-bot@chromium.org>
Fri, 16 Jun 2017 16:17:05 +0000 (16:17 +0000)
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>

src/core/SkValidatingReadBuffer.cpp

index 253b3f2..bb0b162 100644 (file)
@@ -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);
     }
 }