Revert "[skjson] Size-constrained input API"

This reverts commit fc792b8718cc30e9da62c9559b23c1baac3166bb.

Reason for revert: New ASAN, Android failures.

Original change's description:
> [skjson] Size-constrained input API
> 
> Pass an explicit input size instead of requiring a C string.
> 
> Thanks to mtklein's clever trick, this has no measurable perf impact.
> 
> Change-Id: I64f210a9f653a78b05ab6b58fa34479504aa35ff
> Reviewed-on: https://skia-review.googlesource.com/134940
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>

TBR=mtklein@google.com,fmalita@chromium.org

Change-Id: Ic0b52398b1ce6f64c781debb858829cb64bbae58
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/135022
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

1 files changed, 9 insertions, 1 deletions

diff --git a/modules/skjson/src/FuzzSkJSON.cpp b/modules/skjson/src/FuzzSkJSON.cpp
index 2e971ce249..ce33cc1299 100644
--- a/modules/skjson/src/FuzzSkJSON.cpp
+++ b/modules/skjson/src/FuzzSkJSON.cpp
@@ -5,12 +5,20 @@
  * found in the LICENSE file.
  */
 
+#include "SkAutoMalloc.h"
 #include "SkData.h"
 #include "SkJSON.h"
 #include "SkStream.h"
 
 void FuzzSkJSON(sk_sp<SkData> bytes) {
-    skjson::DOM dom(static_cast<const char*>(bytes->data()), bytes->size());
+    // TODO: add a size + len skjson::DOM factory?
+    SkAutoMalloc data(bytes->size() + 1);
+    auto* c_str = static_cast<char*>(data.get());
+
+    memcpy(c_str, bytes->data(), bytes->size());
+    c_str[bytes->size()] = '\0';
+
+    skjson::DOM dom(c_str);
     SkDynamicMemoryWStream wstream;
     dom.write(&wstream);
 }