diff options
| author |  Mike Reed <reed@google.com> | 2017-12-06 16:09:20 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-06 21:33:00 +0000 |
| commit | fadbfcd4aba676d44dfb08de1a83143a1c63b95c (patch) | |
| tree | a67a5a69ce9e7e9d0bbbd4507c6a6f6f65c90ace /fuzz | |
| parent | a492eb0e1f08311bfa47f46c660144e7bc8a6c0e (diff) | |
upgrade SkReadBuffer to always validate
Bug: skia:
Change-Id: I054560b66c6cde346d939015326d8547879d2c4b
Reviewed-on: https://skia-review.googlesource.com/81160
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/FuzzCanvas.cpp | 6 | ||||
| -rw-r--r-- | fuzz/fuzz.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index a3737dc332..618f7ac934 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -52,6 +52,7 @@ #include "SkPaintImageFilter.h" #include "SkPerlinNoiseShader.h" #include "SkPictureImageFilter.h" +#include "SkReadBuffer.h" #include "SkRRectsGaussianEdgeMaskFilter.h" #include "SkTableColorFilter.h" #include "SkTextBlob.h" @@ -60,7 +61,6 @@ // SRC #include "SkUtils.h" -#include "SkValidatingReadBuffer.h" #if SK_SUPPORT_GPU #include "GrContextFactory.h" @@ -1771,8 +1771,8 @@ DEF_FUZZ(RasterN32CanvasViaSerialization, fuzz) { if (!pic) { fuzz->signalBug(); } sk_sp<SkData> data = pic->serialize(); if (!data) { fuzz->signalBug(); } - SkValidatingReadBuffer vrb(data->data(), data->size()); - auto deserialized = SkPicture::MakeFromBuffer(vrb); + SkReadBuffer rb(data->data(), data->size()); + auto deserialized = SkPicture::MakeFromBuffer(rb); if (!deserialized) { fuzz->signalBug(); } auto surface = SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height()); SkASSERT(surface && surface->getCanvas()); diff --git a/fuzz/fuzz.cpp b/fuzz/fuzz.cpp index ae9f0a4b01..f2f483ac72 100644 --- a/fuzz/fuzz.cpp +++ b/fuzz/fuzz.cpp @@ -20,11 +20,11 @@ #include "SkPaint.h" #include "SkPath.h" #include "SkPicture.h" +#include "SkReadBuffer.h" #include "SkRegion.h" #include "SkStream.h" #include "SkSurface.h" #include "SkTextBlob.h" -#include "SkValidatingReadBuffer.h" #if SK_SUPPORT_GPU #include "SkSLCompiler.h" @@ -479,7 +479,7 @@ static void fuzz_color_deserialize(sk_sp<SkData> bytes) { static void fuzz_path_deserialize(sk_sp<SkData> bytes) { SkPath path; - SkValidatingReadBuffer buf(bytes->data(), bytes->size()); + SkReadBuffer buf(bytes->data(), bytes->size()); buf.readPath(&path); if (!buf.isValid()) { SkDebugf("[terminated] Couldn't deserialize SkPath.\n"); @@ -512,7 +512,7 @@ static void fuzz_region_deserialize(sk_sp<SkData> bytes) { } static void fuzz_textblob_deserialize(sk_sp<SkData> bytes) { - SkValidatingReadBuffer buf(bytes->data(), bytes->size()); + SkReadBuffer buf(bytes->data(), bytes->size()); auto tb = SkTextBlob::MakeFromBuffer(buf); if (!buf.isValid()) { SkDebugf("[terminated] Couldn't deserialize SkTextBlob.\n"); |