virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avformat/network: Check for av_malloc* failures in ff_tls_init()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-22 15:50:48 +01:00
parent 9d7ae72725
commit 7620d48f2e
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/network.c
View File

@ -66,7 +66,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif #endif
#endif #endif
void ff_tls_init(void) int ff_tls_init(void)
{ {
avpriv_lock_avformat(); avpriv_lock_avformat();
#if CONFIG_OPENSSL #if CONFIG_OPENSSL
@ -77,6 +77,8 @@ void ff_tls_init(void)
if (!CRYPTO_get_locking_callback()) { if (!CRYPTO_get_locking_callback()) {
int i; int i;
openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks()); openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks());
if (!openssl_mutexes)
return AVERROR(ENOMEM);
for (i = 0; i < CRYPTO_num_locks(); i++) for (i = 0; i < CRYPTO_num_locks(); i++)
pthread_mutex_init(&openssl_mutexes[i], NULL); pthread_mutex_init(&openssl_mutexes[i], NULL);
CRYPTO_set_locking_callback(openssl_lock); CRYPTO_set_locking_callback(openssl_lock);
@ -96,6 +98,8 @@ void ff_tls_init(void)
gnutls_global_init(); gnutls_global_init();
#endif #endif
avpriv_unlock_avformat(); avpriv_unlock_avformat();
return 0;
} }
void ff_tls_deinit(void) void ff_tls_deinit(void)

2
libavformat/network.h
View File

@ -78,7 +78,7 @@ extern int ff_network_inited_globally;
int ff_network_init(void); int ff_network_init(void);
void ff_network_close(void); void ff_network_close(void);
void ff_tls_init(void); int ff_tls_init(void);
void ff_tls_deinit(void); void ff_tls_deinit(void);
int ff_network_wait_fd(int fd, int write); int ff_network_wait_fd(int fd, int write);

3
libavformat/tls.c
View File

@ -175,7 +175,8 @@ static int tls_open(URLContext *h, const char *uri, int flags)
const char *proxy_path; const char *proxy_path;
int use_proxy; int use_proxy;
ff_tls_init(); if ((ret = ff_tls_init()) < 0)
return ret;
if (c->listen) if (c->listen)
snprintf(opts, sizeof(opts), "?listen=1"); snprintf(opts, sizeof(opts), "?listen=1");

3
libavformat/utils.c
View File

@ -4095,7 +4095,8 @@ int avformat_network_init(void)
ff_network_inited_globally = 1; ff_network_inited_globally = 1;
if ((ret = ff_network_init()) < 0) if ((ret = ff_network_init()) < 0)
return ret; return ret;
ff_tls_init(); if ((ret = ff_tls_init()) < 0)
return ret;
#endif #endif
return 0; return 0;
} }