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

add asserts on Sk4px::Map functions that our arrays are non-null.

Browse Source 
There's a crasher (null dereference it looks like) in Clank with an impossible stack, but with blit mask on top (apparently sk_free() calls blit mask...).  Can't hurt to check that all these Sk4px-using methods are iterating over non-null arrays.

(This is that bug I mentioned that got me thinking about blit mask in the first place.)

BUG=520354

Review URL: https://codereview.chromium.org/1295443002
This commit is contained in:
mtklein 2015-08-13 07:51:29 -07:00 committed by Commit bot
parent 272b748792
commit 15f4951e84
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/Sk4px.h
View File

@ -110,6 +110,8 @@ public:
// fn should take an Sk4px (4 src pixels) and return an Sk4px (4 dst pixels).
template <typename Fn, typename Dst>
static void MapSrc(int n, Dst* dst, const SkPMColor* src, const Fn& fn) {
SkASSERT(dst);
SkASSERT(src);
// This looks a bit odd, but it helps loop-invariant hoisting across different calls to fn.
// Basically, we need to make sure we keep things inside a single loop.
while (n > 0) {
@ -140,6 +142,8 @@ public:
// As above, but with dst4' = fn(dst4, src4).
template <typename Fn, typename Dst>
static void MapDstSrc(int n, Dst* dst, const SkPMColor* src, const Fn& fn) {
SkASSERT(dst);
SkASSERT(src);
while (n > 0) {
if (n >= 8) {
Sk4px dst0 = fn(Load4(dst+0), Load4(src+0)),
@ -168,6 +172,8 @@ public:
// As above, but with dst4' = fn(dst4, alpha4).
template <typename Fn, typename Dst>
static void MapDstAlpha(int n, Dst* dst, const SkAlpha* a, const Fn& fn) {
SkASSERT(dst);
SkASSERT(a);
while (n > 0) {
if (n >= 8) {
Sk4px dst0 = fn(Load4(dst+0), Load4Alphas(a+0)),
@ -197,6 +203,9 @@ public:
template <typename Fn, typename Dst>
static void MapDstSrcAlpha(int n, Dst* dst, const SkPMColor* src, const SkAlpha* a,
const Fn& fn) {
SkASSERT(dst);
SkASSERT(src);
SkASSERT(a);
while (n > 0) {
if (n >= 8) {
Sk4px dst0 = fn(Load4(dst+0), Load4(src+0), Load4Alphas(a+0)),