AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use validating buffer for skpath

Browse Source 
Bug: skia:
Change-Id: I92191e60c874ff123b7d839f5c65f32e180f69eb
Reviewed-on: https://skia-review.googlesource.com/69080
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
Kevin Lubick 2017-11-09 08:12:56 -05:00 committed by Skia Commit-Bot
parent fc45998242
commit c9d2829c5a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuzz/fuzz.cpp
View File

@ -23,6 +23,7 @@
#include "SkRegion.h"
#include "SkStream.h"
#include "SkSurface.h"
#include "SkValidatingReadBuffer.h"
#if SK_SUPPORT_GPU
#include "SkSLCompiler.h"
@ -92,8 +93,6 @@ static int fuzz_file(const char* path) {
return 1;
}
uint8_t option = calculate_option(bytes.get());
if (!FLAGS_type.isEmpty()) {
if (0 == strcmp("api", FLAGS_type[0])) {
fuzz_api(bytes);
@ -108,10 +107,12 @@ static int fuzz_file(const char* path) {
return 0;
}
if (0 == strcmp("image_scale", FLAGS_type[0])) {
uint8_t option = calculate_option(bytes.get());
fuzz_img(bytes, option, 0);
return 0;
}
if (0 == strcmp("image_mode", FLAGS_type[0])) {
uint8_t option = calculate_option(bytes.get());
fuzz_img(bytes, 0, option);
return 0;
}
@ -472,10 +473,13 @@ static void fuzz_color_deserialize(sk_sp<SkData> bytes) {
static void fuzz_path_deserialize(sk_sp<SkData> bytes) {
SkPath path;
if (!path.readFromMemory(bytes->data(), bytes->size())) {
SkDebugf("[terminated] Couldn't initialize SkPath.\n");
SkValidatingReadBuffer buf(bytes->data(), bytes->size());
buf.readPath(&path);
if (!buf.isValid()) {
SkDebugf("[terminated] Couldn't deserialize SkPath.\n");
return;
}
auto s = SkSurface::MakeRasterN32Premul(1024, 1024);
s->getCanvas()->drawPath(path, SkPaint());
SkDebugf("[terminated] Success! Initialized SkPath.\n");