Do not store colorproperties until alpha item is found

colorProperties could be pointing to a dangling pointer if findAlphaItem() resizes the meta.items array.
libsdl-org · Nov 28, 2023 · 7845153 · 7845153
1 parent af93d66
commit 7845153
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/read.c b/src/read.c
@@ -4804,7 +4804,6 @@ avifResult avifDecoderReset(avifDecoder * decoder)
                                                   /*isItemInInput=*/AVIF_TRUE,
                                                   &data->tileInfos[AVIF_ITEM_COLOR].grid,
                                                   &codecType[AVIF_ITEM_COLOR]));
-        colorProperties = &data->meta->items.item[mainItemIndices[AVIF_ITEM_COLOR]].properties;
         colorCodecType = codecType[AVIF_ITEM_COLOR];
 
         // Optional alpha auxiliary item
@@ -4865,6 +4864,7 @@ avifResult avifDecoderReset(avifDecoder * decoder)
         for (int c = 0; c < AVIF_ITEM_CATEGORY_COUNT; ++c) {
             mainItems[c] = (mainItemIndices[c] == -1) ? NULL : &data->meta->items.item[mainItemIndices[c]];
         }
+        colorProperties = &mainItems[AVIF_ITEM_COLOR]->properties;
 
         // Find Exif and/or XMP metadata, if any
         AVIF_CHECKRES(avifDecoderFindMetadata(decoder, data->meta, decoder->image, mainItems[AVIF_ITEM_COLOR]->id));