master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace HeapAlloc with malloc (#1378)

Browse Source 
Use malloc/free instead of HeapAlloc/HeapFree
This commit is contained in:
Pavel Punsky 2024-01-18 21:08:28 -08:00 committed by GitHub
parent 348380f248
commit 0afbc6204d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/apps/relay/mainrelay.c
View File

@ -38,9 +38,6 @@
#define WORKING_BUFFER_SIZE 15000
#define MAX_TRIES 3
#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
#define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
#endif
#if (!defined OPENSSL_VERSION_1_1_1)
@ -300,7 +297,7 @@ static int make_local_listeners_list(void) {
do {
pAddresses = (IP_ADAPTER_ADDRESSES *)MALLOC(outBufLen);
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");
return -1;
@ -309,7 +306,7 @@ static int make_local_listeners_list(void) {
dwRetVal = GetAdaptersAddresses(family, flags, NULL, pAddresses, &outBufLen);
if (dwRetVal == ERROR_BUFFER_OVERFLOW) {
FREE(pAddresses);
free(pAddresses);
pAddresses = NULL;
} else {
break;
@ -470,14 +467,14 @@ static int make_local_listeners_list(void) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "\tError: %s", lpMsgBuf);
LocalFree(lpMsgBuf);
if (pAddresses)
FREE(pAddresses);
free(pAddresses);
return -2;
}
}
}
if (pAddresses) {
FREE(pAddresses);
free(pAddresses);
}
#else
@ -551,7 +548,7 @@ static int make_local_relays_list(int allow_local, int family) {
do {
pAddresses = (IP_ADAPTER_ADDRESSES *)MALLOC(outBufLen);
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");
return -1;
@ -560,7 +557,7 @@ static int make_local_relays_list(int allow_local, int family) {
dwRetVal = GetAdaptersAddresses(fm, flags, NULL, pAddresses, &outBufLen);
if (dwRetVal == ERROR_BUFFER_OVERFLOW) {
FREE(pAddresses);
free(pAddresses);
pAddresses = NULL;
} else {
break;
@ -624,7 +621,7 @@ static int make_local_relays_list(int allow_local, int family) {
}
if (pAddresses) {
FREE(pAddresses);
free(pAddresses);
}
#else
struct ifaddrs *ifs = NULL;
@ -709,7 +706,7 @@ int get_a_local_relay(int family, ioa_addr *relay_addr) {
do {
pAddresses = (IP_ADAPTER_ADDRESSES *)MALLOC(outBufLen);
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");
return -1;
@ -718,7 +715,7 @@ int get_a_local_relay(int family, ioa_addr *relay_addr) {
dwRetVal = GetAdaptersAddresses(fm, flags, NULL, pAddresses, &outBufLen);
if (dwRetVal == ERROR_BUFFER_OVERFLOW) {
FREE(pAddresses);
free(pAddresses);
pAddresses = NULL;
} else {
break;
@ -785,7 +782,7 @@ int get_a_local_relay(int family, ioa_addr *relay_addr) {
}
if (pAddresses) {
FREE(pAddresses);
free(pAddresses);
}
#else
struct ifaddrs *ifs = NULL;