highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/dashdec: Avoid segfault when URL template is unexpectedly missing

Browse Source 
This isn't supposed to happen, but unfinished support for non-templated
manifests and lack of e.g. presentationTimeOffset handling can provoke
such a situation even with well-formed input.
This commit is contained in:
sfan5
2021-02-04 09:33:17 +08:00
committed by Steven Liu
parent 5a98a027d6
commit a44c42dc31
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/dashdec.c
View File

@@ -1626,8 +1626,15 @@ static struct fragment *get_current_fragment(struct representation *pls)
} }
} }
if (seg) { if (seg) {
char *tmpfilename= av_mallocz(c->max_url_size); char *tmpfilename;
if (!pls->url_template) {
av_log(pls->parent, AV_LOG_ERROR, "Cannot get fragment, missing template URL\n");
av_free(seg);
return NULL;
}
tmpfilename = av_mallocz(c->max_url_size);
if (!tmpfilename) { if (!tmpfilename) {
av_free(seg);
return NULL; return NULL;
} }
ff_dash_fill_tmpl_params(tmpfilename, c->max_url_size, pls->url_template, 0, pls->cur_seq_no, 0, get_segment_start_time_based_on_timeline(pls, pls->cur_seq_no)); ff_dash_fill_tmpl_params(tmpfilename, c->max_url_size, pls->url_template, 0, pls->cur_seq_no, 0, get_segment_start_time_based_on_timeline(pls, pls->cur_seq_no));
@@ -1638,6 +1645,7 @@ static struct fragment *get_current_fragment(struct representation *pls)
if (!seg->url) { if (!seg->url) {
av_log(pls->parent, AV_LOG_ERROR, "Cannot resolve template url '%s'\n", pls->url_template); av_log(pls->parent, AV_LOG_ERROR, "Cannot resolve template url '%s'\n", pls->url_template);
av_free(tmpfilename); av_free(tmpfilename);
av_free(seg);
return NULL; return NULL;
} }
} }