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>

src/gpu/gl/builders/GrGLProgramBuilder.cpp

diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
index dbe0581..a6a16f0 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -255,7 +255,7 @@
     } else if (cached) {
         ATRACE_ANDROID_FRAMEWORK_ALWAYS("cache_hit");
         SkReader32 reader(fCached->data(), fCached->size());
-        SkFourByteTag shaderType = reader.readU32();
+        SkFourByteTag shaderType = GrPersistentCacheUtils::GetType(&reader);
 
         switch (shaderType) {
             case kGLPB_Tag: {
@@ -562,7 +562,7 @@
                                            GrGLGpu* gpu,
                                            const SkData& cachedData) {
     SkReader32 reader(cachedData.data(), cachedData.size());
-    SkFourByteTag shaderType = reader.readU32();
+    SkFourByteTag shaderType = GrPersistentCacheUtils::GetType(&reader);
     if (shaderType != kSKSL_Tag) {
         // TODO: Support GLSL, and maybe even program binaries, too?
         return false;