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
197197 HEIFItem *item = NULL;
198198
199199 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)
201201 continue;
202202
203203 item = c->heif_item[i];
@@ -8690,6 +8690,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 8486 unmodified lines
86908690 if (item_count > c->nb_heif_item)
86918691 memset(&c->heif_item[c->nb_heif_item], 0,
86928692 sizeof(*c->heif_item) * (item_count - c->nb_heif_item));
8693+ c->nb_heif_item = FFMAX(c->nb_heif_item, item_count);
86938694
86948695 av_log(c->fc, AV_LOG_TRACE, "iloc: item_count %d\n", item_count);
86958696 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
87338734 av_log(c->fc, AV_LOG_TRACE, "iloc: item_idx %d, offset_type %d, "
87348735 "extent_offset %"PRId64", extent_length %"PRId64"\n",
87358736 i, offset_type, item->extent_offset, item->extent_length);
8736−
8737− c->nb_heif_item = FFMAX(c->nb_heif_item, i + 1);
87388737 }
87398738
87408739 c->found_iloc = 1;
@@ -8828,6 +8827,7 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 87 unmodified lines
88288827 if (entry_count > c->nb_heif_item)
88298828 memset(&c->heif_item[c->nb_heif_item], 0,
88308829 sizeof(*c->heif_item) * (entry_count - c->nb_heif_item));
8830+ c->nb_heif_item = FFMAX(c->nb_heif_item, entry_count);
88318831
88328832 for (i = 0; i < entry_count; i++) {
88338833 MOVAtom infe;
@@ -8843,7 +8843,6 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 9 unmodified lines
88438843 goto fail;
88448844 if (!ret)
88458845 got_stream = 1;
8846− c->nb_heif_item = FFMAX(c->nb_heif_item, i + 1);
88478846 }
88488847
88498848 c->found_iinf = got_stream;
@@ -8881,7 +8880,7 @@ static int mov_read_iref_dimg(MOVContext *c, AVIOContext *pb, int version) · 31 unmodified lines
88818880 }
88828881 }
88838882 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)
88858884 continue;
88868885 item = c->heif_item[i];
88878886
@@ -9799,6 +9798,8 @@ static int mov_read_close(AVFormatContext *s) · 911 unmodified lines
97999798 av_freep(&mov->aes_decrypt);
98009799 av_freep(&mov->chapter_tracks);
98019800 for (i = 0; i < mov->nb_heif_item; i++) {
9801+ if (!mov->heif_item[i])
9802+ continue;
98029803 av_freep(&mov->heif_item[i]->name);
98039804 av_freep(&mov->heif_item[i]->icc_profile);
98049805 av_freep(&mov->heif_item[i]);
@@ -10188,7 +10189,7 @@ static int mov_parse_tiles(AVFormatContext *s) · 383 unmodified lines
1018810189 HEIFItem *item = mov->heif_item[k];
1018910190 AVStream *st = item->st;
1019010191
10191− if (item->item_id != tile_id)
10192+ if (!item || item->item_id != tile_id)
1019210193 continue;
1019310194 if (!st) {
1019410195 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
1025910260 AVStream *st;
1026010261 int64_t offset = 0;
1026110262
10263+ if (!item)
10264+ continue;
1026210265 if (!item->st) {
1026310266 if (item->item_id == mov->thmb_item_id) {
1026410267 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