ensure self-consistent parameters for drawtext

Bug: skia:7426
Change-Id: Iea687bc1a03b3428a1648bc75861276cb7e970da
Reviewed-on: https://skia-review.googlesource.com/87782
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 071e6b3650..9a9aed3192 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -74,6 +74,10 @@ public:
     const void* text() { return (const void*)fText; }
     size_t fByteLength;
     const char* fText;
+
+    bool validate(SkReadBuffer* reader, int count, const SkPaint& paint) const {
+        return reader->validate(paint.countText(fText, fByteLength) == count);
+    }
 };
 
 void get_text(SkReadBuffer* reader, TextContainer* text) {
@@ -479,6 +483,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
             TextContainer text;
             get_text(reader, &text);
             size_t points = reader->readInt();
+            text.validate(reader, points, *paint);
             const SkPoint* pos = (const SkPoint*)reader->skip(points * sizeof(SkPoint));
             BREAK_ON_READ_ERROR(reader);
 
@@ -491,9 +496,11 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
             TextContainer text;
             get_text(reader, &text);
             size_t points = reader->readInt();
+            text.validate(reader, points, *paint);
             const SkPoint* pos = (const SkPoint*)reader->skip(points * sizeof(SkPoint));
             const SkScalar top = reader->readScalar();
             const SkScalar bottom = reader->readScalar();
+            SkDebugf("postexth count %zu pos %p\n", points, pos);
             BREAK_ON_READ_ERROR(reader);
 
             SkRect clip = canvas->getLocalClipBounds();
@@ -506,6 +513,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
             TextContainer text;
             get_text(reader, &text);
             size_t xCount = reader->readInt();
+            text.validate(reader, xCount, *paint);
             const SkScalar constY = reader->readScalar();
             const SkScalar* xpos = (const SkScalar*)reader->skip(xCount * sizeof(SkScalar));
             BREAK_ON_READ_ERROR(reader);
@@ -519,6 +527,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
             TextContainer text;
             get_text(reader, &text);
             size_t xCount = reader->readInt();
+            text.validate(reader, xCount, *paint);
             const SkScalar* xpos = (const SkScalar*)reader->skip((3 + xCount) * sizeof(SkScalar));
             BREAK_ON_READ_ERROR(reader);