commit 1facd5e8d1149850282a5248d0b1943f5026a8cc
author Brian Osman <brianosman@google.com> Mon Mar 16 16:21:24 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 17 13:52:47 2020 +0000
tree 6a93fe4277945558ef97a399ac74ccb429880c45
parent a17558c9f70262eace249a4546aff2375d738050

Make persistent cache serialization safer

Add a version tag at the start, reject any cache blobs without it

Bug: chromium:1062018
Change-Id: I18bb668e6b836e1247640e9286a69a3e745babfd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/277376
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index ccec67e..b1c3819 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -2134,7 +2134,7 @@
                         }
 
                         SkReader32 reader(data->data(), data->size());
-                        entry.fShaderType = reader.readU32();
+                        entry.fShaderType = GrPersistentCacheUtils::GetType(&reader);
                         GrPersistentCacheUtils::UnpackCachedShaders(&reader, entry.fShader,
                                                                     entry.fInputs,
                                                                     kGrShaderTypeCount);