commit d136b8a2621f064f496cc114957b24588937befa
author Ram Mohan <ram.mohan@ittiam.com> Fri Jun 02 09:06:40 2023 +0530
committer Dichen Zhang <dichenzhang@google.com> Fri Jun 02 20:11:05 2023 +0000
tree aabb5e9a03f528787e93d02b8078c3673ab88577
parent 7fbf5f1aa5da99c7dd912562207c8df68e9e08d5

ultrahdr: Add fuzz application for decode api

Bug: 282640328
Test: ./ultrahdr_dec_fuzzer

Change-Id: I9bd2a314d05122fd3010889b661455a6cba364e6

libs/ultrahdr/jpegr.cpp

diff --git a/libs/ultrahdr/jpegr.cpp b/libs/ultrahdr/jpegr.cpp
index b2bde6c..25197d6 100644
--- a/libs/ultrahdr/jpegr.cpp
+++ b/libs/ultrahdr/jpegr.cpp
@@ -119,6 +119,13 @@
     return ERROR_JPEGR_INVALID_INPUT_TYPE;
   }
 
+  if (uncompressed_p010_image->width > kMaxWidth
+          || uncompressed_p010_image->height > kMaxHeight) {
+    ALOGE("Image dimensions cannot be larger than %dx%d, image dimensions %dx%d",
+          kMaxWidth, kMaxHeight, uncompressed_p010_image->width, uncompressed_p010_image->height);
+    return ERROR_JPEGR_INVALID_INPUT_TYPE;
+  }
+
   if (uncompressed_p010_image->colorGamut <= ULTRAHDR_COLORGAMUT_UNSPECIFIED
           || uncompressed_p010_image->colorGamut > ULTRAHDR_COLORGAMUT_MAX) {
     ALOGE("Unrecognized p010 color gamut %d", uncompressed_p010_image->colorGamut);