commit 1b6a4edfee30b4d9f822c6c3795bef465bc3e32c
author Wan-Teh Chang <wtc@google.com> Wed Aug 17 18:14:40 2022 -0700
committer Wan-Teh Chang <wtc@google.com> Wed Aug 17 22:08:57 2022 -0700
tree dfde3ab312a386c487c55cedaa81ecca28536f25
parent e0954237c40ff75dbc79991ea4774853ad09bed7

Fix Clang -Wshorten-64-to-32 warnings

Finish the job of https://github.com/AOMediaCodec/libavif/pull/1037.

contrib/gdk-pixbuf/loader.c

diff --git a/contrib/gdk-pixbuf/loader.c b/contrib/gdk-pixbuf/loader.c
index 908d6e5..32c6eee 100644
--- a/contrib/gdk-pixbuf/loader.c
+++ b/contrib/gdk-pixbuf/loader.c
@@ -365,12 +365,11 @@
                 }
 
                 if (quality < 0 || quality > 100) {
-
                     g_set_error(error,
                                 GDK_PIXBUF_ERROR,
                                 GDK_PIXBUF_ERROR_BAD_OPTION,
-                                "AVIF quality must be a value between 0 and 100; value \"%d\" is not allowed.",
-                                (int)quality);
+                                "AVIF quality must be a value between 0 and 100; value \"%ld\" is not allowed.",
+                                quality);
 
                     return FALSE;
                 }
@@ -423,7 +422,7 @@
         }
     }
 
-    max_quantizer = AVIF_QUANTIZER_WORST_QUALITY * ( 100 - CLAMP(quality, 0, 100)) / 100;
+    max_quantizer = AVIF_QUANTIZER_WORST_QUALITY * (100 - (int)quality) / 100;
     min_quantizer = 0;
     alpha_quantizer = 0;
 

src/read.c

diff --git a/src/read.c b/src/read.c
index 48e3451..b67e22e 100644
--- a/src/read.c
+++ b/src/read.c
@@ -3101,7 +3101,11 @@
 
             avifDecoderItem * item = avifMetaFindItem(decoder->data->meta, sample->itemID);
             avifROData itemContents;
-            avifResult readResult = avifDecoderItemRead(item, decoder->io, &itemContents, sample->offset, bytesToRead, &decoder->diag);
+            if (sample->offset > SIZE_MAX) {
+                return AVIF_RESULT_BMFF_PARSE_FAILED;
+            }
+            size_t offset = (size_t)sample->offset;
+            avifResult readResult = avifDecoderItemRead(item, decoder->io, &itemContents, offset, bytesToRead, &decoder->diag);
             if (readResult != AVIF_RESULT_OK) {
                 return readResult;
             }