RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/dashdec: Fix for ticket 7149 (Segfault when decoding dash streams) 

Add NULL pointer check for init_section
This commit is contained in:
Colin NG 2018-05-24 11:09:20 +08:00 committed by Steven Liu
parent 8ef51a4092
commit 9aee574dd0
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavformat/dashdec.c
View File

@ -1877,25 +1877,40 @@ fail:
static int init_section_compare_video(DASHContext *c) static int init_section_compare_video(DASHContext *c)
{ {
char *url =NULL;
int64_t url_offset = -1;
int64_t size = -1;
int i = 0; int i = 0;
char *url = c->videos[0]->init_section->url;
int64_t url_offset = c->videos[0]->init_section->url_offset; if (c->videos[0]->init_section == NULL)
int64_t size = c->videos[0]->init_section->size; return 0;
url = c->videos[0]->init_section->url;
url_offset = c->videos[0]->init_section->url_offset;
size = c->videos[0]->init_section->size;
for (i=0;i<c->n_videos;i++) { for (i=0;i<c->n_videos;i++) {
if (av_strcasecmp(c->videos[i]->init_section->url,url) || c->videos[i]->init_section->url_offset != url_offset || c->videos[i]->init_section->size != size) { if (av_strcasecmp(c->videos[i]->init_section->url,url) || c->videos[i]->init_section->url_offset != url_offset || c->videos[i]->init_section->size != size) {
return 0; return 0;
} }
} }
return 1; return 1;
} }
static int init_section_compare_audio(DASHContext *c) static int init_section_compare_audio(DASHContext *c)
{ {
char *url =NULL;
int64_t url_offset = -1;
int64_t size = -1;
int i = 0; int i = 0;
char *url = c->audios[0]->init_section->url;
int64_t url_offset = c->audios[0]->init_section->url_offset; if (c->audios[0]->init_section == NULL)
int64_t size = c->audios[0]->init_section->size; return 0;
for (i=0;i<c->n_audios;i++) {
url = c->audios[0]->init_section->url;
url_offset = c->audios[0]->init_section->url_offset;
size = c->audios[0]->init_section->size;
for (i=0; i<c->n_audios; i++) {
if (av_strcasecmp(c->audios[i]->init_section->url,url) || c->audios[i]->init_section->url_offset != url_offset || c->audios[i]->init_section->size != size) { if (av_strcasecmp(c->audios[i]->init_section->url,url) || c->audios[i]->init_section->url_offset != url_offset || c->audios[i]->init_section->size != size) {
return 0; return 0;
} }
@ -1960,6 +1975,7 @@ static int dash_read_header(AVFormatContext *s)
++stream_index; ++stream_index;
} }
if (c->n_audios) { if (c->n_audios) {
c->is_init_section_common_audio = init_section_compare_audio(c); c->is_init_section_common_audio = init_section_compare_audio(c);
} }