[FFmpeg-devel] [PATCH] lavf/tls_gnutls: check for interrupt inside handshake loop

Błażej Szczygieł spaz16 at wp.pl
Wed Sep 4 21:36:52 EEST 2019


> fixes #8080
> 
> Signed-off-by: Błażej Szczygieł <spaz16 at wp.pl>
> ---
>   libavformat/tls_gnutls.c | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
> index f32bc2821b..f507b7d044 100644
> --- a/libavformat/tls_gnutls.c
> +++ b/libavformat/tls_gnutls.c
> @@ -184,6 +184,10 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
>       gnutls_priority_set_direct(p->session, "NORMAL", NULL);
>       do {
>           ret = gnutls_handshake(p->session);
> +        if (ff_check_interrupt(&h->interrupt_callback)) {
> +            ret = AVERROR_EXIT;
> +            goto fail;
> +        }
>           if (gnutls_error_is_fatal(ret)) {
>               ret = print_tls_error(h, ret);
>               goto fail;
> 

Ping?
This causes QMPlay2 unstable in some cases: 
https://github.com/zaps166/QMPlay2/issues/239


More information about the ffmpeg-devel mailing list