Klagarge/tor-heredero-tokenring
Archived
1
0
Fork 0
Code

fix memory leak of mac sender

Browse Source
This commit is contained in:
Rémi Heredero 2024-04-22 13:51:45 +02:00
parent 70a1dc41fa
commit 4f10a41ec0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mac_sender.c
View File

@ -1,6 +1,8 @@
#include "main.h" #include "main.h"
#include <cstdio> #include <cstdio>
#include <stdbool.h>
#include <string.h> #include <string.h>
#include <cassert>
uint8_t* lastToken; uint8_t* lastToken;
osMessageQueueId_t queue_macData_id; osMessageQueueId_t queue_macData_id;
@ -94,12 +96,10 @@ void MacSender(void *argument) {
length = msg[2]; length = msg[2];
status.raw = msg[3+length]; status.raw = msg[3+length];
if(src.addr == BROADCAST_ADDRESS) { if(dst.addr == BROADCAST_ADDRESS) {
retCode = osMemoryPoolFree(memPool, queueMsg.anyPtr); retCode = osMemoryPoolFree(memPool, queueMsg.anyPtr);
CheckRetCode(retCode, __LINE__, __FILE__, CONTINUE); CheckRetCode(retCode, __LINE__, __FILE__, CONTINUE);
} } else if(status.read == 1) {
if(status.read == 1) {
if(status.ack == 0) { if(status.ack == 0) {
msg = osMemoryPoolAlloc(memPool, osWaitForever); msg = osMemoryPoolAlloc(memPool, osWaitForever);
queueMsg.type = TO_PHY; queueMsg.type = TO_PHY;
@ -133,6 +133,8 @@ void MacSender(void *argument) {
0); 0);
CheckRetCode(retCode, __LINE__, __FILE__, CONTINUE); CheckRetCode(retCode, __LINE__, __FILE__, CONTINUE);
} }
}
break; break;
} }
@ -196,7 +198,11 @@ void MacSender(void *argument) {
status.ack = 0; status.ack = 0;
} }
msg = osMemoryPoolAlloc(memPool, osWaitForever); // TODO - Leak of memory msg = osMemoryPoolAlloc(memPool, 0); // TODO - Leak of memory
if(msg == NULL) {
printf("Memory allocation failed\r\n");
assert(false);
}
msg[0] = src.raw; msg[0] = src.raw;
msg[1] = dst.raw; msg[1] = dst.raw;
msg[2] = length; msg[2] = length;