virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Revert "avformat/tls_openssl: add av_assert0() for tls_shared"

Browse Source 
This reverts commits fd55c4b5f7
(for tls_openssl.c) and c74181a04b
(for tls_gnutls.c).

It is impossible for a pointer to a member of a structure
to be NULL: If the containing structure exists, the member
exists and can't have a NULL address; if the containing
structure does not exist, then getting a pointer to the
substructure via &c->tls_shared would already be undefined
behavior.

Reviewed-by: Kacper Michajłow <kasper93@gmail.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-09-18 14:58:55 +02:00
parent db6cd6c6bf
commit b815431126
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/tls_gnutls.c
View File

@@ -30,7 +30,6 @@
#include "os_support.h" #include "os_support.h"
#include "url.h" #include "url.h"
#include "tls.h" #include "tls.h"
#include "libavutil/avassert.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/thread.h" #include "libavutil/thread.h"
@@ -156,7 +155,6 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
TLSShared *s = &c->tls_shared; TLSShared *s = &c->tls_shared;
uint16_t gnutls_flags = 0; uint16_t gnutls_flags = 0;
int ret; int ret;
av_assert0(s);
ff_gnutls_init(); ff_gnutls_init();
@@ -262,7 +260,6 @@ static int dtls_open(URLContext *h, const char *uri, int flags, AVDictionary **o
{ {
TLSContext *c = h->priv_data; TLSContext *c = h->priv_data;
TLSShared *s = &c->tls_shared; TLSShared *s = &c->tls_shared;
av_assert0(s);
s->is_dtls = 1; s->is_dtls = 1;
return tls_open(h, uri, flags, options); return tls_open(h, uri, flags, options);
} }

3
libavformat/tls_openssl.c
View File

@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/avassert.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "network.h" #include "network.h"
#include "os_support.h" #include "os_support.h"
@@ -746,7 +745,6 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary **
TLSContext *c = h->priv_data; TLSContext *c = h->priv_data;
TLSShared *s = &c->tls_shared; TLSShared *s = &c->tls_shared;
int ret = 0; int ret = 0;
av_assert0(s);
s->is_dtls = 1; s->is_dtls = 1;
c->ctx = SSL_CTX_new(s->listen ? DTLS_server_method() : DTLS_client_method()); c->ctx = SSL_CTX_new(s->listen ? DTLS_server_method() : DTLS_client_method());
@@ -847,7 +845,6 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
TLSShared *s = &c->tls_shared; TLSShared *s = &c->tls_shared;
int ret; int ret;
av_assert0(s);
if ((ret = ff_tls_open_underlying(s, h, uri, options)) < 0) if ((ret = ff_tls_open_underlying(s, h, uri, options)) < 0)
goto fail; goto fail;