ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sat Aug 18 02:19:51 2018 +0200| [46753bfdd0182f721499939a1118c0406c8a3674] | committer: Michael Niedermayer
avformat/dashdec: Fix strlen(rep_id_val) with it being NULL Fixes: dash-crash-da39a3ee5e6b4b0d3255bfef95601890afd80709.xml Found-by: Paul Ch <paulc...@icloud.com> Reviewed-by: Steven Liu <l...@chinaffmpeg.org> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46753bfdd0182f721499939a1118c0406c8a3674 --- 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
