History

avformat/mov: check that items are allocated before accessing them

Fixes NULL pointer dereferences introduced in 2e338152a274a5f10670cee3cd16097076216d72 Fixes: clusterfuzz-testcase-fuzzer_loadfile-4753810267897856 Fixes: clusterfuzz-testcase-minimized-fuzzer_loadfile-6042587212873728 Fixes: clusterfuzz-testcase-minimized-fuzzer_loadfile-6536211629408256

James Almer committed 2 years ago

Commit e7bdaad1 parent fe18ed31 file · +9 −6Browse files

Unified · Split

libavformat/mov.c+9−6
@@ -197,7 +197,7 @@ static HEIFItem *heif_cur_item(MOVContext *c) · 196 unmodified lines
197 HEIFItem *item = NULL;197 HEIFItem *item = NULL;
198 198
199 for (int i = 0; i < c->nb_heif_item; i++) {199 for (int i = 0; i < c->nb_heif_item; i++) {
200 if (c->heif_item[i]->item_id != c->cur_item_id)200 if (!c->heif_item[i] || c->heif_item[i]->item_id != c->cur_item_id)
201 continue;201 continue;
202 202
203 item = c->heif_item[i];203 item = c->heif_item[i];
@@ -8690,6 +8690,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 8486 unmodified lines
8690 if (item_count > c->nb_heif_item)8690 if (item_count > c->nb_heif_item)
8691 memset(&c->heif_item[c->nb_heif_item], 0,8691 memset(&c->heif_item[c->nb_heif_item], 0,
8692 sizeof(*c->heif_item) * (item_count - c->nb_heif_item));8692 sizeof(*c->heif_item) * (item_count - c->nb_heif_item));
8693 c->nb_heif_item = FFMAX(c->nb_heif_item, item_count);
8693 8694
8694 av_log(c->fc, AV_LOG_TRACE, "iloc: item_count %d\n", item_count);8695 av_log(c->fc, AV_LOG_TRACE, "iloc: item_count %d\n", item_count);
8695 for (int i = 0; i < item_count; i++) {8696 for (int i = 0; i < item_count; i++) {
@@ -8733,8 +8734,6 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 37 unmodified lines
8733 av_log(c->fc, AV_LOG_TRACE, "iloc: item_idx %d, offset_type %d, "8734 av_log(c->fc, AV_LOG_TRACE, "iloc: item_idx %d, offset_type %d, "
8734 "extent_offset %"PRId64", extent_length %"PRId64"\n",8735 "extent_offset %"PRId64", extent_length %"PRId64"\n",
8735 i, offset_type, item->extent_offset, item->extent_length);8736 i, offset_type, item->extent_offset, item->extent_length);
8736
8737 c->nb_heif_item = FFMAX(c->nb_heif_item, i + 1);
8738 }8737 }
8739 8738
8740 c->found_iloc = 1;8739 c->found_iloc = 1;
@@ -8828,6 +8827,7 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 87 unmodified lines
8828 if (entry_count > c->nb_heif_item)8827 if (entry_count > c->nb_heif_item)
8829 memset(&c->heif_item[c->nb_heif_item], 0,8828 memset(&c->heif_item[c->nb_heif_item], 0,
8830 sizeof(*c->heif_item) * (entry_count - c->nb_heif_item));8829 sizeof(*c->heif_item) * (entry_count - c->nb_heif_item));
8830 c->nb_heif_item = FFMAX(c->nb_heif_item, entry_count);
8831 8831
8832 for (i = 0; i < entry_count; i++) {8832 for (i = 0; i < entry_count; i++) {
8833 MOVAtom infe;8833 MOVAtom infe;
@@ -8843,7 +8843,6 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 9 unmodified lines
8843 goto fail;8843 goto fail;
8844 if (!ret)8844 if (!ret)
8845 got_stream = 1;8845 got_stream = 1;
8846 c->nb_heif_item = FFMAX(c->nb_heif_item, i + 1);
8847 }8846 }
8848 8847
8849 c->found_iinf = got_stream;8848 c->found_iinf = got_stream;
@@ -8881,7 +8880,7 @@ static int mov_read_iref_dimg(MOVContext *c, AVIOContext *pb, int version) · 31 unmodified lines
8881 }8880 }
8882 }8881 }
8883 for (int i = 0; i < c->nb_heif_item; i++) {8882 for (int i = 0; i < c->nb_heif_item; i++) {
8884 if (c->heif_item[i]->item_id != from_item_id)8883 if (!c->heif_item[i] || c->heif_item[i]->item_id != from_item_id)
8885 continue;8884 continue;
8886 item = c->heif_item[i];8885 item = c->heif_item[i];
8887 8886
@@ -9799,6 +9798,8 @@ static int mov_read_close(AVFormatContext *s) · 911 unmodified lines
9799 av_freep(&mov->aes_decrypt);9798 av_freep(&mov->aes_decrypt);
9800 av_freep(&mov->chapter_tracks);9799 av_freep(&mov->chapter_tracks);
9801 for (i = 0; i < mov->nb_heif_item; i++) {9800 for (i = 0; i < mov->nb_heif_item; i++) {
9801 if (!mov->heif_item[i])
9802 continue;
9802 av_freep(&mov->heif_item[i]->name);9803 av_freep(&mov->heif_item[i]->name);
9803 av_freep(&mov->heif_item[i]->icc_profile);9804 av_freep(&mov->heif_item[i]->icc_profile);
9804 av_freep(&mov->heif_item[i]);9805 av_freep(&mov->heif_item[i]);
@@ -10188,7 +10189,7 @@ static int mov_parse_tiles(AVFormatContext *s) · 383 unmodified lines
10188 HEIFItem *item = mov->heif_item[k];10189 HEIFItem *item = mov->heif_item[k];
10189 AVStream *st = item->st;10190 AVStream *st = item->st;
10190 10191
10191 if (item->item_id != tile_id)10192 if (!item || item->item_id != tile_id)
10192 continue;10193 continue;
10193 if (!st) {10194 if (!st) {
10194 av_log(s, AV_LOG_WARNING, "HEIF item id %d from grid id %d doesn't "10195 av_log(s, AV_LOG_WARNING, "HEIF item id %d from grid id %d doesn't "
@@ -10259,6 +10260,8 @@ static int mov_parse_heif_items(AVFormatContext *s) · 64 unmodified lines
10259 AVStream *st;10260 AVStream *st;
10260 int64_t offset = 0;10261 int64_t offset = 0;
10261 10262
10263 if (!item)
10264 continue;
10262 if (!item->st) {10265 if (!item->st) {
10263 if (item->item_id == mov->thmb_item_id) {10266 if (item->item_id == mov->thmb_item_id) {
10264 av_log(s, AV_LOG_ERROR, "HEIF thumbnail doesn't reference a stream\n");10267 av_log(s, AV_LOG_ERROR, "HEIF thumbnail doesn't reference a stream\n");

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t