summaryrefslogtreecommitdiff
path: root/libs/ultrahdr/jpegr.cpp
diff options
context:
space:
mode:
author Dichen Zhang <dichenzhang@google.com> 2023-06-06 01:07:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-06-06 01:07:57 +0000
commit05ff67be11fb137d986299ce8f8ed3abc5655e4d (patch)
tree97cd782862570f60ecc62e214d6a786bcf4fb3c8 /libs/ultrahdr/jpegr.cpp
parentcd3f63736194d676c30e2903f87c5d10b30e4b3a (diff)
parentd136b8a2621f064f496cc114957b24588937befa (diff)
Merge "ultrahdr: Add fuzz application for decode api" into udc-dev
Diffstat (limited to 'libs/ultrahdr/jpegr.cpp')
-rw-r--r--libs/ultrahdr/jpegr.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/libs/ultrahdr/jpegr.cpp b/libs/ultrahdr/jpegr.cpp
index ed151f3ad2..415255d4ea 100644
--- a/libs/ultrahdr/jpegr.cpp
+++ b/libs/ultrahdr/jpegr.cpp
@@ -119,6 +119,13 @@ status_t JpegR::areInputArgumentsValid(jr_uncompressed_ptr uncompressed_p010_ima
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);