aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2018-02-06 16:58:21 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-07 14:44:47 +0000
commit2a223358ed19f3dd25f9b127aa21f1dd138cb9f0 (patch)
tree25b240f9d35e0db165d2c8f4889859e2ff9b7510 /src
parented858ec0951a10bc8bef1f883c925e1ac5e5766f (diff)
init matrix if buffer is already bad
Bug: skia: Change-Id: I8d21d846a0657a1e9530adc6613d398932b69e5f Reviewed-on: https://skia-review.googlesource.com/104660 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/SkReadBuffer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp
index d82ec4a046..73e7af0fd7 100644
--- a/src/core/SkReadBuffer.cpp
+++ b/src/core/SkReadBuffer.cpp
@@ -182,9 +182,10 @@ void SkReadBuffer::readMatrix(SkMatrix* matrix) {
size_t size = 0;
if (this->isValid()) {
size = SkMatrixPriv::ReadFromMemory(matrix, fReader.peek(), fReader.available());
- if (!this->validate((SkAlign4(size) == size) && (0 != size))) {
- matrix->reset();
- }
+ (void)this->validate((SkAlign4(size) == size) && (0 != size));
+ }
+ if (!this->isValid()) {
+ matrix->reset();
}
(void)this->skip(size);
}