commit b96ba8f51723c0c38074839c53e4f55f9e86bed2
author Dichen Zhang <dichenzhang@google.com> Tue Mar 21 23:33:41 2023 +0000
committer Dichen Zhang <dichenzhang@google.com> Tue Apr 11 17:26:25 2023 +0000
tree 7662122dd871321137670d999e0692b4105f26f8
parent 71660f18f6312ce8fe2962e116d6a0533491c06f

JPEG/R: add restriction to max_display_boost input from user

Bug: b/264715926

Change-Id: I82c24c285fb01cab57ec004f1440ac9b5adacc39
(cherry picked from commit 4e49f18a515173523992f359a6a74feeb7b822a7)

libs/jpegrecoverymap/jpegr.cpp

diff --git a/libs/jpegrecoverymap/jpegr.cpp b/libs/jpegrecoverymap/jpegr.cpp
index 559ca35..d147130 100644
--- a/libs/jpegrecoverymap/jpegr.cpp
+++ b/libs/jpegrecoverymap/jpegr.cpp
@@ -339,6 +339,10 @@
     return ERROR_JPEGR_INVALID_NULL_PTR;
   }
 
+  if (max_display_boost < 1.0f) {
+      return ERROR_JPEGR_INVALID_INPUT_TYPE;
+  }
+
   if (output_format == JPEGR_OUTPUT_SDR) {
     JpegDecoderHelper jpeg_decoder;
     if (!jpeg_decoder.decompressImage(compressed_jpegr_image->data, compressed_jpegr_image->length,
@@ -683,9 +687,7 @@
   dest->width = uncompressed_yuv_420_image->width;
   dest->height = uncompressed_yuv_420_image->height;
   ShepardsIDW idwTable(kMapDimensionScaleFactor);
-  float display_boost = max_display_boost > 0 ?
-          std::min(max_display_boost, metadata->maxContentBoost)
-          : metadata->maxContentBoost;
+  float display_boost = std::min(max_display_boost, metadata->maxContentBoost);
   RecoveryLUT recoveryLUT(metadata, display_boost);
 
   JobQueue jobQueue;