commit a7e1c89a9b50f9799b8a534a7f88dc97924b9898
author Adrienne Walker <enne@chromium.org> Fri Mar 15 10:55:31 2019 -0700
committer Mike Klein <mtklein@google.com> Thu Mar 21 01:45:19 2019 +0000
tree aae0ff17b7896b6b0e74759c51ba50a8ca638845
parent d617ed5f02ec2d6575cf35a23be723b2c41ab5b4

Enforce alignment in SkDescriptor deserialization

SkDescriptor::Alloc asserts on this.

Bug: chromium:942430
Change-Id: Iad28f02bd261b03b5cff33bd1959946787c4087f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201602
Auto-Submit: Adrienne Walker <enne@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
(cherry picked from commit 5d3ddcb6d8beca098297b644e211277f2ac12f43)
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202342
Commit-Queue: Adrienne Walker <enne@chromium.org>
Reviewed-by: Adrienne Walker <enne@chromium.org>

src/core/SkRemoteGlyphCache.cpp

diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp
index 68033cd..f192ed9 100644
--- a/src/core/SkRemoteGlyphCache.cpp
+++ b/src/core/SkRemoteGlyphCache.cpp
@@ -127,6 +127,7 @@
         uint32_t descLength = 0u;
         if (!read<uint32_t>(&descLength)) return false;
         if (descLength < sizeof(SkDescriptor)) return false;
+        if (descLength != SkAlign4(descLength)) return false;
 
         auto* result = this->ensureAtLeast(descLength, alignof(SkDescriptor));
         if (!result) return false;