virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

Revert "avformat/tls_openssl: properly get new BIO index"

Browse Source 
BIO_get_new_index() is static counter meant to get index for custom bio
type definition. As we can read in the documentation:

> Note that BIO_get_new_index() can only be used 127 times before it
> returns an error.

We cannot call it repeatedly, because it will fail eventually.

To my understanding the index is not needed in our use and we could
safely use BIO_TYPE_NONE. Documentation states:

> type can be set to either BIO_TYPE_NONE or via BIO_get_new_index() if
> a unique type is required for searching (See BIO_find_type(3))

We don't use any search related functions.

This reverts commit 816dad231f.
Fixes: https://github.com/mpv-player/mpv/issues/16589

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
This commit is contained in:
Kacper Michajłow
2025-07-29 00:39:18 +02:00
parent f09c834a7d
commit daee46ed7e
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/tls_openssl.c
View File

@ -659,14 +659,11 @@ static int url_bio_bputs(BIO *b, const char *str)
return url_bio_bwrite(b, str, strlen(str)); return url_bio_bwrite(b, str, strlen(str));
} }
static av_cold int init_bio_method(URLContext *h) static av_cold void init_bio_method(URLContext *h)
{ {
TLSContext *p = h->priv_data; TLSContext *p = h->priv_data;
BIO *bio; BIO *bio;
int bio_idx = BIO_get_new_index(); p->url_bio_method = BIO_meth_new(BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
if (bio_idx == -1)
return AVERROR_EXTERNAL;
p->url_bio_method = BIO_meth_new(bio_idx | BIO_TYPE_SOURCE_SINK, "urlprotocol bio");
BIO_meth_set_write(p->url_bio_method, url_bio_bwrite); BIO_meth_set_write(p->url_bio_method, url_bio_bwrite);
BIO_meth_set_read(p->url_bio_method, url_bio_bread); BIO_meth_set_read(p->url_bio_method, url_bio_bread);
BIO_meth_set_puts(p->url_bio_method, url_bio_bputs); BIO_meth_set_puts(p->url_bio_method, url_bio_bputs);
@ -677,7 +674,6 @@ static av_cold int init_bio_method(URLContext *h)
BIO_set_data(bio, p); BIO_set_data(bio, p);
SSL_set_bio(p->ssl, bio, bio); SSL_set_bio(p->ssl, bio, bio);
return 0;
} }
static void openssl_info_callback(const SSL *ssl, int where, int ret) { static void openssl_info_callback(const SSL *ssl, int where, int ret) {
@ -874,11 +870,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary **
SSL_set_options(p->ssl, SSL_OP_NO_QUERY_MTU); SSL_set_options(p->ssl, SSL_OP_NO_QUERY_MTU);
SSL_set_mtu(p->ssl, c->mtu); SSL_set_mtu(p->ssl, c->mtu);
DTLS_set_link_mtu(p->ssl, c->mtu); DTLS_set_link_mtu(p->ssl, c->mtu);
init_bio_method(h);
ret = init_bio_method(h);
if (ret < 0)
goto fail;
if (p->tls_shared.external_sock != 1) { if (p->tls_shared.external_sock != 1) {
if ((ret = ff_tls_open_underlying(&p->tls_shared, h, url, options)) < 0) { if ((ret = ff_tls_open_underlying(&p->tls_shared, h, url, options)) < 0) {
av_log(p, AV_LOG_ERROR, "Failed to connect %s\n", url); av_log(p, AV_LOG_ERROR, "Failed to connect %s\n", url);
@ -956,9 +948,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
} }
SSL_set_ex_data(p->ssl, 0, p); SSL_set_ex_data(p->ssl, 0, p);
SSL_CTX_set_info_callback(p->ctx, openssl_info_callback); SSL_CTX_set_info_callback(p->ctx, openssl_info_callback);
ret = init_bio_method(h); init_bio_method(h);
if (ret < 0)
goto fail;
if (!c->listen && !c->numerichost) { if (!c->listen && !c->numerichost) {
// By default OpenSSL does too lax wildcard matching // By default OpenSSL does too lax wildcard matching
SSL_set_hostflags(p->ssl, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); SSL_set_hostflags(p->ssl, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);