From 386371c174eacad2723335ffe4aecdb18cf07fed Mon Sep 17 00:00:00 2001 From: Gustavo Garcia Date: Sun, 21 Apr 2024 23:05:29 +0200 Subject: [PATCH] Fix lint errors --- src/apps/relay/mainrelay.c | 6 +++--- src/apps/relay/mainrelay.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 9dc7565..9ab87a5 100644 --- a/src/apps/relay/mainrelay.c +++ b/src/apps/relay/mainrelay.c @@ -747,7 +747,6 @@ int get_a_local_relay(int family, ioa_addr *relay_addr) { outBufLen = WORKING_BUFFER_SIZE; do { - pAddresses = (IP_ADAPTER_ADDRESSES *)malloc(outBufLen); if (pAddresses == NULL) { TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "Memory allocation failed for IP_ADAPTER_ADDRESSES struct\n"); @@ -836,6 +835,7 @@ int get_a_local_relay(int family, ioa_addr *relay_addr) { if (pAddresses) { free(pAddresses); } + return -1; #else struct ifaddrs *ifs = NULL; @@ -1781,7 +1781,8 @@ unsigned char *base64decode(const void *b64_decode_this, int decode_this_many_by int decoded_byte_index = 0; // Index where the next base64_decoded byte should be written. while (0 < BIO_read(b64_bio, base64_decoded + decoded_byte_index, 1)) { // Read byte-by-byte. decoded_byte_index++; // Increment the index until read of BIO decoded data is complete. - } // Once we're done reading decoded data, BIO_read returns -1 even though there's no error. + } // Once we're done reading decoded data, BIO_read returns -1 even though there's no error. + BIO_free_all(b64_bio); // Destroys all BIOs in chain, starting with b64 (i.e. the 1st one). return base64_decoded; // Returns base-64 decoded data with trailing null terminator. } @@ -3833,7 +3834,6 @@ static void set_ctx(SSL_CTX **out, const char *protocol, const SSL_METHOD *metho *out = ctx; } - #if OPENSSL_VERSION_NUMBER >= 0x30200010L if (turn_params.rpk_enabled) { unsigned char cert_type = TLSEXT_cert_type_rpk; diff --git a/src/apps/relay/mainrelay.h b/src/apps/relay/mainrelay.h index d77147a..35a0d92 100644 --- a/src/apps/relay/mainrelay.h +++ b/src/apps/relay/mainrelay.h @@ -32,11 +32,11 @@ #define __MAIN_RELAY__ #include +#include #include #include #include #include -#include #include