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

Michael Niedermayer michael at niedermayer.cc
Thu Sep 5 18:01:48 EEST 2019


On Fri, Aug 16, 2019 at 10:38:46AM +0200, Błażej Szczygieł wrote:
> 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;

probably ok

Thanks

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

Democracy is the form of government in which you can choose your dictator
-------------- 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/20190905/75adaace/attachment.sig>


More information about the ffmpeg-devel mailing list