eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libavformat/tls_libtls: handle TLS_WANT_{POLLIN, POLLOUT} in read/write functions

Browse source 
According to the tls documentation: tls_read() and tls_write() can
return TLS_WANT_POLLIN and TLS_WANT_POLLOUT which indicates that the
same operation must be repeated immediately.

This commit prevents the libtls backend from failing when libtls returns
TLS_WANT_POLLIN or TLS_WANT_POLLOUT with the following error:

    [tls @ 0x7f6e20005a00] (null)

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Matthieu Bouron 2022-05-23 12:44:33 +02:00 • committed by Marton Balint
parent 830f49cb9d
commit 6dd6c58d89
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavformat/tls_libtls.c
View file

@ -158,6 +158,8 @@ static int ff_tls_read(URLContext *h, uint8_t *buf, int size)
return ret; return ret;
else if (ret == 0) else if (ret == 0)
return AVERROR_EOF; return AVERROR_EOF;
else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT)
return AVERROR(EAGAIN);
av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx)); av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx));
return AVERROR(EIO); return AVERROR(EIO);
} }
@ -171,6 +173,8 @@ static int ff_tls_write(URLContext *h, const uint8_t *buf, int size)
return ret; return ret;
else if (ret == 0) else if (ret == 0)
return AVERROR_EOF; return AVERROR_EOF;
else if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT)
return AVERROR(EAGAIN);
av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx)); av_log(h, AV_LOG_ERROR, "%s\n", tls_error(p->ctx));
return AVERROR(EIO); return AVERROR(EIO);
} }