diff options
author | Mike Reed <reed@google.com> | 2018-01-23 12:34:56 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-23 20:19:10 +0000 |
commit | 574b06f7038f32680919b72ca7a3ef95584184db (patch) | |
tree | d6d2d73b37e6582ad17dcaa8b6c6fd4669c609a4 /src/core | |
parent | 959ccc2aefbaf0bc8b58f44d2fc85cddb1d027cf (diff) |
init out-param on buffer failure
Bug:804651
Change-Id: Ia3c71e2fbe35b55bf27075e6a11ec8c5bd3fb40f
Reviewed-on: https://skia-review.googlesource.com/98663
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkReadBuffer.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/SkReadBuffer.cpp b/src/core/SkReadBuffer.cpp index 8da4089a17..d82ec4a046 100644 --- a/src/core/SkReadBuffer.cpp +++ b/src/core/SkReadBuffer.cpp @@ -182,7 +182,9 @@ void SkReadBuffer::readMatrix(SkMatrix* matrix) { size_t size = 0; if (this->isValid()) { size = SkMatrixPriv::ReadFromMemory(matrix, fReader.peek(), fReader.available()); - this->validate((SkAlign4(size) == size) && (0 != size)); + if (!this->validate((SkAlign4(size) == size) && (0 != size))) { + matrix->reset(); + } } (void)this->skip(size); } @@ -209,7 +211,9 @@ void SkReadBuffer::readRegion(SkRegion* region) { size_t size = 0; if (!fError) { size = region->readFromMemory(fReader.peek(), fReader.available()); - this->validate((SkAlign4(size) == size) && (0 != size)); + if (!this->validate((SkAlign4(size) == size) && (0 != size))) { + region->setEmpty(); + } } (void)this->skip(size); } @@ -218,7 +222,9 @@ void SkReadBuffer::readPath(SkPath* path) { size_t size = 0; if (!fError) { size = path->readFromMemory(fReader.peek(), fReader.available()); - this->validate((SkAlign4(size) == size) && (0 != size)); + if (!this->validate((SkAlign4(size) == size) && (0 != size))) { + path->reset(); + } } (void)this->skip(size); } |