> On Aug 18, 2018, at 09:14, Michael Niedermayer <mich...@niedermayer.cc> wrote: > > Fixes: dash-crash-da39a3ee5e6b4b0d3255bfef95601890afd80709.xml > > Found-by: Paul Ch <paulc...@icloud.com> > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > --- > libavformat/dashdec.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c > index f851bbf981..c6dddeb98f 100644 > --- a/libavformat/dashdec.c > +++ b/libavformat/dashdec.c > @@ -857,7 +857,9 @@ static int parse_manifest_representation(AVFormatContext > *s, const char *url, > baseurl_nodes[3] = representation_baseurl_node; > > ret = resolve_content_path(s, url, &c->max_url_size, baseurl_nodes, > 4); > - c->max_url_size = aligned(c->max_url_size + strlen(rep_id_val) + > strlen(rep_bandwidth_val)); > + c->max_url_size = aligned(c->max_url_size > + + (rep_id_val ? strlen(rep_id_val) : 0) > + + (rep_bandwidth_val ? > strlen(rep_bandwidth_val) : 0)); > if (ret == AVERROR(ENOMEM) || ret == 0) { > goto end; > } > -- > 2.18.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
LGTM Thanks Steven _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel