From 31476b7c942fece7d206c8d9a2e66e814592da45 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Thu, 22 Feb 2018 16:09:33 -0500 Subject: Update piex and add test image Bug: oss-fuzz:6347 Change-Id: Iacf8c7a1677f2651e5c211cffb09eecb388a5f8a Reviewed-on: https://skia-review.googlesource.com/109400 Reviewed-by: Kevin Lubick Commit-Queue: Leon Scroggins --- DEPS | 2 +- resources/invalid_images/ossfuzz6347 | Bin 0 -> 5000 bytes tests/CodecTest.cpp | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 resources/invalid_images/ossfuzz6347 diff --git a/DEPS b/DEPS index 6d5692f202..958ea0b666 100644 --- a/DEPS +++ b/DEPS @@ -17,7 +17,7 @@ deps = { "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.6.1", "third_party/externals/lua" : "https://skia.googlesource.com/external/github.com/lua/lua.git@v5-3-4", "third_party/externals/microhttpd" : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d", - "third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@8f540f64b6c170a16fb7e6e52d61819705c1522a", + "third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@f7fc905cff18c7b883712bbfaffabd5d187bc787", "third_party/externals/sdl" : "https://skia.googlesource.com/third_party/sdl@5d7cfcca344034aff9327f77fc181ae3754e7a90", "third_party/externals/sfntly" : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916", "third_party/externals/skcms" : "https://skia.googlesource.com/skcms@3b6adcfa3a75b834525dee2af88c5fe79fb40eda", diff --git a/resources/invalid_images/ossfuzz6347 b/resources/invalid_images/ossfuzz6347 new file mode 100644 index 0000000000..f4fa7dc85f Binary files /dev/null and b/resources/invalid_images/ossfuzz6347 differ diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 6e0a88cd5a..e3362f5815 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -658,6 +658,7 @@ DEF_TEST(Codec_Empty, r) { test_invalid(r, "invalid_images/b37623797.ico"); test_invalid(r, "invalid_images/osfuzz6295.webp"); test_invalid(r, "invalid_images/osfuzz6288.bmp"); + test_invalid(r, "invalid_images/ossfuzz6347"); } #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED -- cgit v1.2.3