generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavformat/tls_securetransport: fix argument evalulation order UB

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Rodger Combs 2015-10-04 14:37:52 -05:00 committed by Michael Niedermayer
parent 46f3015f35
commit 854972b53d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/tls_securetransport.c
View File

@ -350,8 +350,9 @@ static int map_ssl_error(OSStatus status, size_t processed)
static int tls_read(URLContext *h, uint8_t *buf, int size) static int tls_read(URLContext *h, uint8_t *buf, int size)
{ {
TLSContext *c = h->priv_data; TLSContext *c = h->priv_data;
size_t processed; size_t processed = 0;
int ret = map_ssl_error(SSLRead(c->ssl_context, buf, size, &processed), processed); int ret = SSLRead(c->ssl_context, buf, size, &processed);
ret = map_ssl_error(ret, processed);
if (ret > 0) if (ret > 0)
return ret; return ret;
if (ret == 0) if (ret == 0)
@ -362,8 +363,9 @@ static int tls_read(URLContext *h, uint8_t *buf, int size)
static int tls_write(URLContext *h, const uint8_t *buf, int size) static int tls_write(URLContext *h, const uint8_t *buf, int size)
{ {
TLSContext *c = h->priv_data; TLSContext *c = h->priv_data;
size_t processed; size_t processed = 0;
int ret = map_ssl_error(SSLWrite(c->ssl_context, buf, size, &processed), processed); int ret = SSLWrite(c->ssl_context, buf, size, &processed);
ret = map_ssl_error(ret, processed);
if (ret > 0) if (ret > 0)
return ret; return ret;
if (ret == 0) if (ret == 0)