[FFmpeg-devel] [PATCH] avformat/dashdec: Fix strlen(rep_id_val) with it being NULL

[Michael Niedermayer]

On Sat, Aug 18, 2018 at 09:19:10AM +0800, Steven Liu wrote:
> 
> 
> > On Aug 18, 2018, at 09:14, Michael Niedermayer <michael at niedermayer.cc> wrote:
> > 
> > Fixes: dash-crash-da39a3ee5e6b4b0d3255bfef95601890afd80709.xml
> > 
> > Found-by: Paul Ch <paulcher at icloud.com>
> > Signed-off-by: Michael Niedermayer <michael at 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 at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> LGTM

will apply

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180818/4dc6046f/attachment.sig>