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

Assert text passed to canvas is initialized.

Browse Source 
A new fuzzer appears to be complaining about using uninitialized glyph
ids. These uninitilized glyph ids appear to be comming from far up the
stack, but they don't actually get used until much later. If Skia is
passed uninitialized memory in a draw call it will of course eventually
need to use it and be blamed when it does. This change will make it
obvious if the issue is up stack from Skia.

BUG=chromium:750070,chromium:750071,chromium:750072

Change-Id: Ic6ca2f6af3620ad4a31cb017570f42550360891a
Reviewed-on: https://skia-review.googlesource.com/29421
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
Ben Wagner 2017-08-01 13:22:23 -04:00 committed by Skia Commit-Bot
parent f1aace23d4
commit 4bd3b09054
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/SkCanvas.cpp
View File

@ -24,6 +24,7 @@
#include "SkMakeUnique.h"
#include "SkMatrixUtils.h"
#include "SkMetaData.h"
#include "SkMSAN.h"
#include "SkNoDrawCanvas.h"
#include "SkNx.h"
#include "SkPaintPriv.h"
@ -2567,6 +2568,7 @@ void SkCanvas::drawText(const void* text, size_t byteLength, SkScalar x, SkScala
const SkPaint& paint) {
TRACE_EVENT0("skia", TRACE_FUNC);
if (byteLength) {
sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
this->onDrawText(text, byteLength, x, y, paint);
}
}
@ -2574,6 +2576,7 @@ void SkCanvas::drawPosText(const void* text, size_t byteLength, const SkPoint po
const SkPaint& paint) {
TRACE_EVENT0("skia", TRACE_FUNC);
if (byteLength) {
sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
this->onDrawPosText(text, byteLength, pos, paint);
}
}
@ -2581,6 +2584,7 @@ void SkCanvas::drawPosTextH(const void* text, size_t byteLength, const SkScalar
SkScalar constY, const SkPaint& paint) {
TRACE_EVENT0("skia", TRACE_FUNC);
if (byteLength) {
sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
this->onDrawPosTextH(text, byteLength, xpos, constY, paint);
}
}
@ -2588,6 +2592,7 @@ void SkCanvas::drawTextOnPath(const void* text, size_t byteLength, const SkPath&
const SkMatrix* matrix, const SkPaint& paint) {
TRACE_EVENT0("skia", TRACE_FUNC);
if (byteLength) {
sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
this->onDrawTextOnPath(text, byteLength, path, matrix, paint);
}
}
@ -2595,6 +2600,7 @@ void SkCanvas::drawTextRSXform(const void* text, size_t byteLength, const SkRSXf
const SkRect* cullRect, const SkPaint& paint) {
TRACE_EVENT0("skia", TRACE_FUNC);
if (byteLength) {
sk_msan_assert_initialized(text, SkTAddOffset<const void>(text, byteLength));
this->onDrawTextRSXform(text, byteLength, xform, cullRect, paint);
}
}