Fix possible null pointer dereference and unintended integer division

AOMediaCodec · Oct 7, 2024 · 9829987 · 9829987
1 parent 4932ace
commit 9829987
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/apps/avifgainmaputil/tonemap_command.cc b/apps/avifgainmaputil/tonemap_command.cc
@@ -94,8 +94,8 @@ avifResult TonemapCommand::Run() {
       static_cast<float>(image->gainMap->baseHdrHeadroom.n) /
       image->gainMap->baseHdrHeadroom.d;
   const float alternate_hdr_hreadroom =
-      static_cast<float>(image->gainMap->alternateHdrHeadroom.n /
-                         image->gainMap->alternateHdrHeadroom.d);
+      static_cast<float>(image->gainMap->alternateHdrHeadroom.n) /
+      image->gainMap->alternateHdrHeadroom.d;
   // We are either tone mapping to the base image (i.e. leaving it as is),
   // or tone mapping to the alternate image (i.e. fully applying the gain map),
   // or tone mapping in between (partially applying the gain map).

diff --git a/src/gainmap.c b/src/gainmap.c
@@ -77,8 +77,6 @@ avifResult avifRGBImageApplyGainMap(const avifRGBImage * baseImage,
 {
     avifDiagnosticsClearError(diag);
 
-    AVIF_CHECKRES(avifGainMapValidateMetadata(gainMap, diag));
-
     if (hdrHeadroom < 0.0f) {
         avifDiagnosticsPrintf(diag, "hdrHeadroom should be >= 0, got %f", hdrHeadroom);
         return AVIF_RESULT_INVALID_ARGUMENT;
@@ -87,6 +85,7 @@ avifResult avifRGBImageApplyGainMap(const avifRGBImage * baseImage,
         avifDiagnosticsPrintf(diag, "NULL input image");
         return AVIF_RESULT_INVALID_ARGUMENT;
     }
+    AVIF_CHECKRES(avifGainMapValidateMetadata(gainMap, diag));
 
     const uint32_t width = baseImage->width;
     const uint32_t height = baseImage->height;