diff mbox series

[FFmpeg-devel,v1] libavformat/hls: During operation, the user exits and interrupts, causing pls->segment to be released, resulting in a null pointer crash

Message ID 20201016125512.84739-1-javashu2012@gmail.com
State New
Headers show
Series [FFmpeg-devel,v1] libavformat/hls: During operation, the user exits and interrupts, causing pls->segment to be released, resulting in a null pointer crash
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make warning Make failed

Commit Message

徐慧书 Oct. 16, 2020, 12:55 p.m. UTC
From: bevis <javashu2012@gmail.com>

Signed-off-by: bevis <javashu2012@gmail.com>
---
 libavformat/hls.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Andreas Rheinhardt Oct. 16, 2020, 1:31 p.m. UTC | #1
javashu2012@gmail.com:
> From: bevis <javashu2012@gmail.com>
> 
> Signed-off-by: bevis <javashu2012@gmail.com>
> ---
>  libavformat/hls.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/hls.c b/libavformat/hls.c
> index 72e28ab94f..0a522a4595 100644
> --- a/libavformat/hls.c
> +++ b/libavformat/hls.c
> @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
>          pls->ctx->interrupt_callback = s->interrupt_callback;
>          url = av_strdup(pls->segments[0]->url);
>          ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
> -        av_free(url);
>          if (ret < 0) {
>              /* Free the ctx - it isn't initialized properly at this point,
>               * so avformat_close_input shouldn't be called. If
>               * avformat_open_input fails below, it frees and zeros the
>               * context, so it doesn't need any special treatment like this. */
> -            av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", pls->segments[0]->url);
> +            av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", url);
>              avformat_free_context(pls->ctx);
>              pls->ctx = NULL;
> +            av_free(url);
>              goto fail;
>          }
> +        av_free(url);
>          pls->ctx->pb       = &pls->pb;
>          pls->ctx->io_open  = nested_io_open;
>          pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
> 
The change itself seems fine to me (I wonder why this hasn't been
noticed when writing/reviewing b5e39880fb), but your commit message is
way too long: The first line should be a short description followed by a
more detailed description lateron (in the next lines).

How exactly did you find this?

- Andreas
徐慧书 Oct. 17, 2020, 4:33 a.m. UTC | #2
It was found in the crash logs of online users, and it was also simulated
locally. In China, we have a very large number of users, and the hls
protocol is widely used, with hundreds of millions of views every day, and
every small problem becomes more obvious.


Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五 下午9:32写道:

> javashu2012@gmail.com:
> > From: bevis <javashu2012@gmail.com>
> >
> > Signed-off-by: bevis <javashu2012@gmail.com>
> > ---
> >  libavformat/hls.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/hls.c b/libavformat/hls.c
> > index 72e28ab94f..0a522a4595 100644
> > --- a/libavformat/hls.c
> > +++ b/libavformat/hls.c
> > @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
> >          pls->ctx->interrupt_callback = s->interrupt_callback;
> >          url = av_strdup(pls->segments[0]->url);
> >          ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
> > -        av_free(url);
> >          if (ret < 0) {
> >              /* Free the ctx - it isn't initialized properly at this
> point,
> >               * so avformat_close_input shouldn't be called. If
> >               * avformat_open_input fails below, it frees and zeros the
> >               * context, so it doesn't need any special treatment like
> this. */
> > -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> '%s'\n", pls->segments[0]->url);
> > +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> '%s'\n", url);
> >              avformat_free_context(pls->ctx);
> >              pls->ctx = NULL;
> > +            av_free(url);
> >              goto fail;
> >          }
> > +        av_free(url);
> >          pls->ctx->pb       = &pls->pb;
> >          pls->ctx->io_open  = nested_io_open;
> >          pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
> >
> The change itself seems fine to me (I wonder why this hasn't been
> noticed when writing/reviewing b5e39880fb), but your commit message is
> way too long: The first line should be a short description followed by a
> more detailed description lateron (in the next lines).
>
> How exactly did you find this?
>
> - Andreas
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
徐慧书 Oct. 17, 2020, 5:38 a.m. UTC | #3
Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五 下午9:32写道:

> javashu2012@gmail.com:
> > From: bevis <javashu2012@gmail.com>
> >
> > Signed-off-by: bevis <javashu2012@gmail.com>
> > ---
> >  libavformat/hls.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/hls.c b/libavformat/hls.c
> > index 72e28ab94f..0a522a4595 100644
> > --- a/libavformat/hls.c
> > +++ b/libavformat/hls.c
> > @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
> >          pls->ctx->interrupt_callback = s->interrupt_callback;
> >          url = av_strdup(pls->segments[0]->url);
> >          ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
> > -        av_free(url);
> >          if (ret < 0) {
> >              /* Free the ctx - it isn't initialized properly at this
> point,
> >               * so avformat_close_input shouldn't be called. If
> >               * avformat_open_input fails below, it frees and zeros the
> >               * context, so it doesn't need any special treatment like
> this. */
> > -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> '%s'\n", pls->segments[0]->url);
> > +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> '%s'\n", url);
> >              avformat_free_context(pls->ctx);
> >              pls->ctx = NULL;
> > +            av_free(url);
> >              goto fail;
> >          }
> > +        av_free(url);
> >          pls->ctx->pb       = &pls->pb;
> >          pls->ctx->io_open  = nested_io_open;
> >          pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
> >
> The change itself seems fine to me (I wonder why this hasn't been
> noticed when writing/reviewing b5e39880fb), but your commit message is
> way too long: The first line should be a short description followed by a
> more detailed description lateron (in the next lines).
>
> How exactly did you find this?
>
> - Andreas
>

It was found in the crash logs of online users, and it was also simulated
locally. In China, we have a very large number of users, and the hls
protocol is widely used, with hundreds of millions of views every day, and
every small problem becomes more obvious.

> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Steven Liu Oct. 17, 2020, 8:55 a.m. UTC | #4
> 在 2020年10月17日,13:38,徐慧书 <javashu2012@gmail.com> 写道:
> 
> Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五 下午9:32写道:
> 
>> javashu2012@gmail.com:
>>> From: bevis <javashu2012@gmail.com>
>>> 
>>> Signed-off-by: bevis <javashu2012@gmail.com>
>>> ---
>>> libavformat/hls.c | 5 +++--
>>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/libavformat/hls.c b/libavformat/hls.c
>>> index 72e28ab94f..0a522a4595 100644
>>> --- a/libavformat/hls.c
>>> +++ b/libavformat/hls.c
>>> @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
>>>         pls->ctx->interrupt_callback = s->interrupt_callback;
>>>         url = av_strdup(pls->segments[0]->url);
>>>         ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
>>> -        av_free(url);
>>>         if (ret < 0) {
>>>             /* Free the ctx - it isn't initialized properly at this
>> point,
>>>              * so avformat_close_input shouldn't be called. If
>>>              * avformat_open_input fails below, it frees and zeros the
>>>              * context, so it doesn't need any special treatment like
>> this. */
>>> -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
>> '%s'\n", pls->segments[0]->url);
>>> +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
>> '%s'\n", url);
>>>             avformat_free_context(pls->ctx);
>>>             pls->ctx = NULL;
>>> +            av_free(url);
>>>             goto fail;
>>>         }
>>> +        av_free(url);
>>>         pls->ctx->pb       = &pls->pb;
>>>         pls->ctx->io_open  = nested_io_open;
>>>         pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
>>> 
>> The change itself seems fine to me (I wonder why this hasn't been
>> noticed when writing/reviewing b5e39880fb), but your commit message is
>> way too long: The first line should be a short description followed by a
>> more detailed description lateron (in the next lines).
>> 
>> How exactly did you find this?
>> 
>> - Andreas
>> 
> 
> It was found in the crash logs of online users, and it was also simulated
> locally. In China, we have a very large number of users, and the hls
> protocol is widely used, with hundreds of millions of views every day, and
> every small problem becomes more obvious.
maybe more than 1.5 billions right now. :D

> 
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>> 
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Thanks
Steven
徐慧书 Oct. 19, 2020, 2:07 a.m. UTC | #5
Steven Liu <lq@chinaffmpeg.org> 于2020年10月17日周六 下午4:57写道:

>
>
> > 在 2020年10月17日,13:38,徐慧书 <javashu2012@gmail.com> 写道:
> >
> > Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五
> 下午9:32写道:
> >
> >> javashu2012@gmail.com:
> >>> From: bevis <javashu2012@gmail.com>
> >>>
> >>> Signed-off-by: bevis <javashu2012@gmail.com>
> >>> ---
> >>> libavformat/hls.c | 5 +++--
> >>> 1 file changed, 3 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/libavformat/hls.c b/libavformat/hls.c
> >>> index 72e28ab94f..0a522a4595 100644
> >>> --- a/libavformat/hls.c
> >>> +++ b/libavformat/hls.c
> >>> @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
> >>>         pls->ctx->interrupt_callback = s->interrupt_callback;
> >>>         url = av_strdup(pls->segments[0]->url);
> >>>         ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0,
> 0);
> >>> -        av_free(url);
> >>>         if (ret < 0) {
> >>>             /* Free the ctx - it isn't initialized properly at this
> >> point,
> >>>              * so avformat_close_input shouldn't be called. If
> >>>              * avformat_open_input fails below, it frees and zeros the
> >>>              * context, so it doesn't need any special treatment like
> >> this. */
> >>> -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> >> '%s'\n", pls->segments[0]->url);
> >>> +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> >> '%s'\n", url);
> >>>             avformat_free_context(pls->ctx);
> >>>             pls->ctx = NULL;
> >>> +            av_free(url);
> >>>             goto fail;
> >>>         }
> >>> +        av_free(url);
> >>>         pls->ctx->pb       = &pls->pb;
> >>>         pls->ctx->io_open  = nested_io_open;
> >>>         pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
> >>>
> >> The change itself seems fine to me (I wonder why this hasn't been
> >> noticed when writing/reviewing b5e39880fb), but your commit message is
> >> way too long: The first line should be a short description followed by a
> >> more detailed description lateron (in the next lines).
> >>
> >> How exactly did you find this?
> >>
> >> - Andreas
> >>
> >
> > It was found in the crash logs of online users, and it was also simulated
> > locally. In China, we have a very large number of users, and the hls
> > protocol is widely used, with hundreds of millions of views every day,
> and
> > every small problem becomes more obvious.
> maybe more than 1.5 billions right now. :D
>
> Thanks
> Steven
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".


haha,I mean the number of users of our app, not the number of Chinese~~
徐慧书 Oct. 19, 2020, 6:21 a.m. UTC | #6
Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五 下午9:32写道:

> javashu2012@gmail.com:
> > From: bevis <javashu2012@gmail.com>
> >
> > Signed-off-by: bevis <javashu2012@gmail.com>
> > ---
> >  libavformat/hls.c | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/libavformat/hls.c b/libavformat/hls.c
> > index 72e28ab94f..0a522a4595 100644
> > --- a/libavformat/hls.c
> > +++ b/libavformat/hls.c
> > @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
> >          pls->ctx->interrupt_callback = s->interrupt_callback;
> >          url = av_strdup(pls->segments[0]->url);
> >          ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
> > -        av_free(url);
> >          if (ret < 0) {
> >              /* Free the ctx - it isn't initialized properly at this
> point,
> >               * so avformat_close_input shouldn't be called. If
> >               * avformat_open_input fails below, it frees and zeros the
> >               * context, so it doesn't need any special treatment like
> this. */
> > -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> '%s'\n", pls->segments[0]->url);
> > +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> '%s'\n", url);
> >              avformat_free_context(pls->ctx);
> >              pls->ctx = NULL;
> > +            av_free(url);
> >              goto fail;
> >          }
> > +        av_free(url);
> >          pls->ctx->pb       = &pls->pb;
> >          pls->ctx->io_open  = nested_io_open;
> >          pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
> >
> The change itself seems fine to me (I wonder why this hasn't been
> noticed when writing/reviewing b5e39880fb), but your commit message is
> way too long: The first line should be a short description followed by a
> more detailed description lateron (in the next lines).
>
> How exactly did you find this?
>
> - Andreas
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".


hi, Andreas,I have already updated and initiated the submission, what else
do I need to do to submit this fix?
Andreas Rheinhardt Oct. 19, 2020, 7:53 a.m. UTC | #7
徐慧书:
> Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五 下午9:32写道:
> 
>> javashu2012@gmail.com:
>>> From: bevis <javashu2012@gmail.com>
>>>
>>> Signed-off-by: bevis <javashu2012@gmail.com>
>>> ---
>>>  libavformat/hls.c | 5 +++--
>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/libavformat/hls.c b/libavformat/hls.c
>>> index 72e28ab94f..0a522a4595 100644
>>> --- a/libavformat/hls.c
>>> +++ b/libavformat/hls.c
>>> @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
>>>          pls->ctx->interrupt_callback = s->interrupt_callback;
>>>          url = av_strdup(pls->segments[0]->url);
>>>          ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
>>> -        av_free(url);
>>>          if (ret < 0) {
>>>              /* Free the ctx - it isn't initialized properly at this
>> point,
>>>               * so avformat_close_input shouldn't be called. If
>>>               * avformat_open_input fails below, it frees and zeros the
>>>               * context, so it doesn't need any special treatment like
>> this. */
>>> -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
>> '%s'\n", pls->segments[0]->url);
>>> +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
>> '%s'\n", url);
>>>              avformat_free_context(pls->ctx);
>>>              pls->ctx = NULL;
>>> +            av_free(url);
>>>              goto fail;
>>>          }
>>> +        av_free(url);
>>>          pls->ctx->pb       = &pls->pb;
>>>          pls->ctx->io_open  = nested_io_open;
>>>          pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
>>>
>> The change itself seems fine to me (I wonder why this hasn't been
>> noticed when writing/reviewing b5e39880fb), but your commit message is
>> way too long: The first line should be a short description followed by a
>> more detailed description lateron (in the next lines).
>>
>> How exactly did you find this?
>>
>> - Andreas
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> 
> 
> hi, Andreas,I have already updated and initiated the submission, what else
> do I need to do to submit this fix?

It is fine for me, but I am not the maintainer of the hls demuxer.

- Andreas
徐慧书 Oct. 21, 2020, 9:16 a.m. UTC | #8
Steven Liu <lq@chinaffmpeg.org> 于2020年10月17日周六 下午4:57写道:

>
>
> > 在 2020年10月17日,13:38,徐慧书 <javashu2012@gmail.com> 写道:
> >
> > Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五
> 下午9:32写道:
> >
> >> javashu2012@gmail.com:
> >>> From: bevis <javashu2012@gmail.com>
> >>>
> >>> Signed-off-by: bevis <javashu2012@gmail.com>
> >>> ---
> >>> libavformat/hls.c | 5 +++--
> >>> 1 file changed, 3 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/libavformat/hls.c b/libavformat/hls.c
> >>> index 72e28ab94f..0a522a4595 100644
> >>> --- a/libavformat/hls.c
> >>> +++ b/libavformat/hls.c
> >>> @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
> >>>         pls->ctx->interrupt_callback = s->interrupt_callback;
> >>>         url = av_strdup(pls->segments[0]->url);
> >>>         ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0,
> 0);
> >>> -        av_free(url);
> >>>         if (ret < 0) {
> >>>             /* Free the ctx - it isn't initialized properly at this
> >> point,
> >>>              * so avformat_close_input shouldn't be called. If
> >>>              * avformat_open_input fails below, it frees and zeros the
> >>>              * context, so it doesn't need any special treatment like
> >> this. */
> >>> -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> >> '%s'\n", pls->segments[0]->url);
> >>> +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
> >> '%s'\n", url);
> >>>             avformat_free_context(pls->ctx);
> >>>             pls->ctx = NULL;
> >>> +            av_free(url);
> >>>             goto fail;
> >>>         }
> >>> +        av_free(url);
> >>>         pls->ctx->pb       = &pls->pb;
> >>>         pls->ctx->io_open  = nested_io_open;
> >>>         pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
> >>>
> >> The change itself seems fine to me (I wonder why this hasn't been
> >> noticed when writing/reviewing b5e39880fb), but your commit message is
> >> way too long: The first line should be a short description followed by a
> >> more detailed description lateron (in the next lines).
> >>
> >> How exactly did you find this?
> >>
> >> - Andreas
> >>
> >
> > It was found in the crash logs of online users, and it was also simulated
> > locally. In China, we have a very large number of users, and the hls
> > protocol is widely used, with hundreds of millions of views every day,
> and
> > every small problem becomes more obvious.
> maybe more than 1.5 billions right now. :D
>
> >
> >> _______________________________________________
> >> ffmpeg-devel mailing list
> >> ffmpeg-devel@ffmpeg.org
> >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >>
> >> To unsubscribe, visit link above, or email
> >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
> Thanks
> Steven
>
>
hi steven, This modification has not been confirmed, and it was
reinitiated. Is there any problem? What else do I need to do?

>
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Steven Liu Oct. 21, 2020, 10:57 a.m. UTC | #9
> 2020年10月21日 下午5:16,徐慧书 <javashu2012@gmail.com> 写道:
> 
> Steven Liu <lq@chinaffmpeg.org> 于2020年10月17日周六 下午4:57写道:
> 
>> 
>> 
>>> 在 2020年10月17日,13:38,徐慧书 <javashu2012@gmail.com> 写道:
>>> 
>>> Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五
>> 下午9:32写道:
>>> 
>>>> javashu2012@gmail.com:
>>>>> From: bevis <javashu2012@gmail.com>
>>>>> 
>>>>> Signed-off-by: bevis <javashu2012@gmail.com>
>>>>> ---
>>>>> libavformat/hls.c | 5 +++--
>>>>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>>>> 
>>>>> diff --git a/libavformat/hls.c b/libavformat/hls.c
>>>>> index 72e28ab94f..0a522a4595 100644
>>>>> --- a/libavformat/hls.c
>>>>> +++ b/libavformat/hls.c
>>>>> @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext *s)
>>>>>        pls->ctx->interrupt_callback = s->interrupt_callback;
>>>>>        url = av_strdup(pls->segments[0]->url);
>>>>>        ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0,
>> 0);
>>>>> -        av_free(url);
>>>>>        if (ret < 0) {
>>>>>            /* Free the ctx - it isn't initialized properly at this
>>>> point,
>>>>>             * so avformat_close_input shouldn't be called. If
>>>>>             * avformat_open_input fails below, it frees and zeros the
>>>>>             * context, so it doesn't need any special treatment like
>>>> this. */
>>>>> -            av_log(s, AV_LOG_ERROR, "Error when loading first segment
>>>> '%s'\n", pls->segments[0]->url);
>>>>> +            av_log(s, AV_LOG_ERROR, "Error when loading first segment
>>>> '%s'\n", url);
>>>>>            avformat_free_context(pls->ctx);
>>>>>            pls->ctx = NULL;
>>>>> +            av_free(url);
>>>>>            goto fail;
>>>>>        }
>>>>> +        av_free(url);
>>>>>        pls->ctx->pb       = &pls->pb;
>>>>>        pls->ctx->io_open  = nested_io_open;
>>>>>        pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
>>>>> 
>>>> The change itself seems fine to me (I wonder why this hasn't been
>>>> noticed when writing/reviewing b5e39880fb), but your commit message is
>>>> way too long: The first line should be a short description followed by a
>>>> more detailed description lateron (in the next lines).
>>>> 
>>>> How exactly did you find this?
>>>> 
>>>> - Andreas
>>>> 
>>> 
>>> It was found in the crash logs of online users, and it was also simulated
>>> locally. In China, we have a very large number of users, and the hls
>>> protocol is widely used, with hundreds of millions of views every day,
>> and
>>> every small problem becomes more obvious.
>> maybe more than 1.5 billions right now. :D
>> 
>>> 
>>>> _______________________________________________
>>>> ffmpeg-devel mailing list
>>>> ffmpeg-devel@ffmpeg.org
>>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>> 
>>>> To unsubscribe, visit link above, or email
>>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>>> _______________________________________________
>>> ffmpeg-devel mailing list
>>> ffmpeg-devel@ffmpeg.org
>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>> 
>>> To unsubscribe, visit link above, or email
>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>> 
>> Thanks
>> Steven
>> 
>> 
> hi steven, This modification has not been confirmed, and it was
> reinitiated. Is there any problem? What else do I need to do?
Do you mean I can push this patch? I saw you have beed submit a new patch same as this patch:
https://patchwork.ffmpeg.org/project/ffmpeg/patch/20201019020757.12101-1-javashu2012@gmail.com/

Can I push that?
If (yes)
    I will push that after 24 hours if no objections. :-)


Thanks

Steven Liu
徐慧书 Oct. 22, 2020, 8:57 a.m. UTC | #10
Steven Liu <lq@chinaffmpeg.org> 于2020年10月21日周三 下午6:57写道:

>
>
> > 2020年10月21日 下午5:16,徐慧书 <javashu2012@gmail.com> 写道:
> >
> > Steven Liu <lq@chinaffmpeg.org> 于2020年10月17日周六 下午4:57写道:
> >
> >>
> >>
> >>> 在 2020年10月17日,13:38,徐慧书 <javashu2012@gmail.com> 写道:
> >>>
> >>> Andreas Rheinhardt <andreas.rheinhardt@gmail.com> 于2020年10月16日周五
> >> 下午9:32写道:
> >>>
> >>>> javashu2012@gmail.com:
> >>>>> From: bevis <javashu2012@gmail.com>
> >>>>>
> >>>>> Signed-off-by: bevis <javashu2012@gmail.com>
> >>>>> ---
> >>>>> libavformat/hls.c | 5 +++--
> >>>>> 1 file changed, 3 insertions(+), 2 deletions(-)
> >>>>>
> >>>>> diff --git a/libavformat/hls.c b/libavformat/hls.c
> >>>>> index 72e28ab94f..0a522a4595 100644
> >>>>> --- a/libavformat/hls.c
> >>>>> +++ b/libavformat/hls.c
> >>>>> @@ -1979,17 +1979,18 @@ static int hls_read_header(AVFormatContext
> *s)
> >>>>>        pls->ctx->interrupt_callback = s->interrupt_callback;
> >>>>>        url = av_strdup(pls->segments[0]->url);
> >>>>>        ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0,
> >> 0);
> >>>>> -        av_free(url);
> >>>>>        if (ret < 0) {
> >>>>>            /* Free the ctx - it isn't initialized properly at this
> >>>> point,
> >>>>>             * so avformat_close_input shouldn't be called. If
> >>>>>             * avformat_open_input fails below, it frees and zeros the
> >>>>>             * context, so it doesn't need any special treatment like
> >>>> this. */
> >>>>> -            av_log(s, AV_LOG_ERROR, "Error when loading first
> segment
> >>>> '%s'\n", pls->segments[0]->url);
> >>>>> +            av_log(s, AV_LOG_ERROR, "Error when loading first
> segment
> >>>> '%s'\n", url);
> >>>>>            avformat_free_context(pls->ctx);
> >>>>>            pls->ctx = NULL;
> >>>>> +            av_free(url);
> >>>>>            goto fail;
> >>>>>        }
> >>>>> +        av_free(url);
> >>>>>        pls->ctx->pb       = &pls->pb;
> >>>>>        pls->ctx->io_open  = nested_io_open;
> >>>>>        pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;
> >>>>>
> >>>> The change itself seems fine to me (I wonder why this hasn't been
> >>>> noticed when writing/reviewing b5e39880fb), but your commit message is
> >>>> way too long: The first line should be a short description followed
> by a
> >>>> more detailed description lateron (in the next lines).
> >>>>
> >>>> How exactly did you find this?
> >>>>
> >>>> - Andreas
> >>>>
> >>>
> >>> It was found in the crash logs of online users, and it was also
> simulated
> >>> locally. In China, we have a very large number of users, and the hls
> >>> protocol is widely used, with hundreds of millions of views every day,
> >> and
> >>> every small problem becomes more obvious.
> >> maybe more than 1.5 billions right now. :D
> >>
> >>>
> >>>> _______________________________________________
> >>>> ffmpeg-devel mailing list
> >>>> ffmpeg-devel@ffmpeg.org
> >>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >>>>
> >>>> To unsubscribe, visit link above, or email
> >>>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> >>> _______________________________________________
> >>> ffmpeg-devel mailing list
> >>> ffmpeg-devel@ffmpeg.org
> >>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >>>
> >>> To unsubscribe, visit link above, or email
> >>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> >>
> >> Thanks
> >> Steven
> >>
> >>
> > hi steven, This modification has not been confirmed, and it was
> > reinitiated. Is there any problem? What else do I need to do?
> Do you mean I can push this patch? I saw you have beed submit a new patch
> same as this patch:
>
> https://patchwork.ffmpeg.org/project/ffmpeg/patch/20201019020757.12101-1-javashu2012@gmail.com/
>
> Can I push that?
> If (yes)
>     I will push that after 24 hours if no objections. :-)
>
>
> Thanks
>
> Steven Liu
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".


yes,you can pull this。
diff mbox series

Patch

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 72e28ab94f..0a522a4595 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1979,17 +1979,18 @@  static int hls_read_header(AVFormatContext *s)
         pls->ctx->interrupt_callback = s->interrupt_callback;
         url = av_strdup(pls->segments[0]->url);
         ret = av_probe_input_buffer(&pls->pb, &in_fmt, url, NULL, 0, 0);
-        av_free(url);
         if (ret < 0) {
             /* Free the ctx - it isn't initialized properly at this point,
              * so avformat_close_input shouldn't be called. If
              * avformat_open_input fails below, it frees and zeros the
              * context, so it doesn't need any special treatment like this. */
-            av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", pls->segments[0]->url);
+            av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", url);
             avformat_free_context(pls->ctx);
             pls->ctx = NULL;
+            av_free(url);
             goto fail;
         }
+        av_free(url);
         pls->ctx->pb       = &pls->pb;
         pls->ctx->io_open  = nested_io_open;
         pls->ctx->flags   |= s->flags & ~AVFMT_FLAG_CUSTOM_IO;