feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

avoid dereference of null pointer if args is null

Browse Source
This commit is contained in:
kaleb-himes
2016-03-01 16:21:03 -07:00
parent 7c63ac4f6a
commit d473452769
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfssl/test.h
View File

@ -834,6 +834,7 @@ static INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
{ {
SOCKADDR_IN_T client; SOCKADDR_IN_T client;
socklen_t client_len = sizeof(client); socklen_t client_len = sizeof(client);
tcp_ready* ready = NULL;
if (udp) { if (udp) {
udp_accept(sockfd, clientfd, useAnyAddr, port, args); udp_accept(sockfd, clientfd, useAnyAddr, port, args);
@ -846,7 +847,8 @@ static INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
#if defined(_POSIX_THREADS) && defined(NO_MAIN_DRIVER) && !defined(__MINGW32__) #if defined(_POSIX_THREADS) && defined(NO_MAIN_DRIVER) && !defined(__MINGW32__)
/* signal ready to tcp_accept */ /* signal ready to tcp_accept */
{ {
tcp_ready* ready = args->signal; if (args)
ready = args->signal;
if (ready) { if (ready) {
pthread_mutex_lock(&ready->mutex); pthread_mutex_lock(&ready->mutex);
ready->ready = 1; ready->ready = 1;
@ -857,15 +859,18 @@ static INLINE void tcp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
} }
#elif defined (WOLFSSL_TIRTOS) #elif defined (WOLFSSL_TIRTOS)
/* Need mutex? */ /* Need mutex? */
tcp_ready* ready = args->signal; if (args)
ready->ready = 1; ready = args->signal;
ready->port = port; if (ready) {
ready->ready = 1;
ready->port = port;
}
#endif #endif
if (ready_file) { if (ready_file) {
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
FILE* srf = NULL; FILE* srf = NULL;
tcp_ready* ready = args ? args->signal : NULL; ready = args ? args->signal : NULL;
if (ready) { if (ready) {
srf = fopen(ready->srfName, "w"); srf = fopen(ready->srfName, "w");