[FFmpeg-devel] [PATCH] avformat/hls: fail on probing non hls/m3u8 file extensions

[Michael Niedermayer]

On Thu, May 04, 2023 at 07:23:02AM +0800, Steven Liu wrote:
> Michael Niedermayer <michael at niedermayer.cc> 于2023年5月3日周三 20:30写道：
> >
> > Its unexpected that a .avi or other "standard" file turns into a playlist.
> > The goal of this patch is to avoid this unexpected behavior and possible
> > privacy or security differences.
> >
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/hls.c | 10 +++++++++-
> >  1 file changed, 9 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavformat/hls.c b/libavformat/hls.c
> > index 8a96a37ff9..826135016d 100644
> > --- a/libavformat/hls.c
> > +++ b/libavformat/hls.c
> > @@ -2530,10 +2530,18 @@ static int hls_probe(const AVProbeData *p)
> >      if (strncmp(p->buf, "#EXTM3U", 7))
> >          return 0;
> >
> > +
> Empty line,

removed


> >      if (strstr(p->buf, "#EXT-X-STREAM-INF:")     ||
> >          strstr(p->buf, "#EXT-X-TARGETDURATION:") ||
> > -        strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:"))
> > +        strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:")) {
> > +
> > +        if (!av_match_ext(p->filename, "m3u8,hls,m3u")) {
> > +            av_log(NULL, AV_LOG_ERROR, "Not detecting m3u8/hls with non standard extension\n");
> > +            return 0;
> > +        }
> > +
> >          return AVPROBE_SCORE_MAX;
> > +    }
> >      return 0;
> >  }
> >
> > --
> > 2.17.1
> >
> > _______________________________________________
> 
> LGTM

will apply

thx

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

Republics decline into democracies and democracies degenerate into
despotisms. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20230505/daa3f9de/attachment.sig>