aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkValidatingReadBuffer.h
diff options
context:
space:
mode:
authorGravatar sugoi <sugoi@chromium.org>2014-06-06 06:44:16 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-06 06:44:17 -0700
commit0951fe12984944406e0f1bb105b9fa4c54fcdcdd (patch)
tree03fe9c0a489b34b1f9e60701e9c0501ae08a9974 /src/core/SkValidatingReadBuffer.h
parent5102345029be75f089e083228e317545627ea1cb (diff)
Fixing another clusterfuzz issue
This was introduced by removing SkValidatingReadBuffer::readBitmap in https://codereview.chromium.org/295793002/ Since SkReadBuffer::skip wasn't virtual, it was using the unsafe SkReadBuffer::skip within SkReadBuffer::readBitmap rather than using SkValidatingReadBuffer::skip. I also removed direct uses of fReader within SkReadBuffer::readBitmap so that it can use the virtual readInt / readFixed functions that have a version in SkValidatingReadBuffer. Also, I changed SkReadBuffer::readPoint so that it uses the virtual readScalar, that way, it becomes redundant with SkValidatingReadBuffer::readPoint, which can then be removed. BUG=380723 R=reed@google.com, mtklein@google.com, sugoi@google.com Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/317003003
Diffstat (limited to 'src/core/SkValidatingReadBuffer.h')
-rw-r--r--src/core/SkValidatingReadBuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkValidatingReadBuffer.h b/src/core/SkValidatingReadBuffer.h
index 0a9e2536d4..5cf3abed68 100644
--- a/src/core/SkValidatingReadBuffer.h
+++ b/src/core/SkValidatingReadBuffer.h
@@ -23,7 +23,7 @@ public:
SkValidatingReadBuffer(const void* data, size_t size);
virtual ~SkValidatingReadBuffer();
- const void* skip(size_t size);
+ virtual const void* skip(size_t size) SK_OVERRIDE;
// primitives
virtual bool readBool() SK_OVERRIDE;