xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/exif.c: pop entry off IFD if allocation fails

Browse Source 
In av_exif_set_entry, if cloning the entry fails because of an alloc
failed, then we remove the entry from the IFD. If that entry exists
in the middle of ifd->entries we need to shift everything to the left
which this commit implements.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
This commit is contained in:
Leo Izen
2026-04-04 11:15:26 -04:00
parent 0c39b1bccd
commit 2cddfe7d0c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/exif.c
+10 -2
View File
@@ -1196,7 +1196,7 @@ int av_exif_set_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, enum AVTif
uint32_t count, const uint8_t *ifd_lead, uint32_t ifd_offset, const void *value)
{
void *temp;
int ret = 0;
int ret, offset;
AVExifEntry *entry = NULL;
AVExifEntry src = { 0 };
@@ -1208,6 +1208,7 @@ int av_exif_set_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, enum AVTif
ret = av_exif_get_entry(logctx, ifd, id, 0, &entry);
if (ret < 0)
return ret;
offset = ret;
if (entry) {
exif_free_entry(entry);
@@ -1235,8 +1236,15 @@ int av_exif_set_entry(void *logctx, AVExifMetadata *ifd, uint16_t id, enum AVTif
ret = exif_clone_entry(entry, &src);
if (ret < 0)
if (ret < 0) {
/* offset is the actual offset + 1 */
if (offset) {
size_t remaining = ifd->count - offset;
/* pop the entry off the IFD by shifting everything to the left */
memmove(&ifd->entries[offset - 1], &ifd->entries[offset], sizeof(*ifd->entries) * remaining);
}
ifd->count--;
}
return ret;
}