Merge pull request #7 from kossnikita/fix/null-free

nimaltd · web-flow · commit 810a79fbb38f · 2023-11-12T10:02:38.000+01:00
Fix null after free
diff --git a/atc.c b/atc.c
@@ -20,7 +20,6 @@ void* atc_alloc(size_t size)
 //####################################################################################################
 void atc_free(void *ptr)
 {
-  if (ptr != NULL)
 #if (_ATC_RTOS == 0)
     free(ptr);
 #else
@@ -207,7 +206,10 @@ int8_t atc_command(atc_t *atc, const char *command, uint32_t timeout_ms, char *a
     }
   }
   for (uint8_t i = 0; i < items; i++)
+  {
     atc_free(atc->searchCmd[i]);
+    atc->searchCmd[i] = NULL;
+  }
   atc_unlock(atc);
   return foundIndex;
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ void* atc_alloc(size_t size)`
`20`	`20`	`//####################################################################################################`
`21`	`21`	`void atc_free(void *ptr)`
`22`	`22`	`{`
`23`		`- if (ptr != NULL)`
`24`	`23`	`#if (_ATC_RTOS == 0)`
`25`	`24`	`free(ptr);`
`26`	`25`	`#else`
`@@ -207,7 +206,10 @@ int8_t atc_command(atc_t atc, const char command, uint32_t timeout_ms, char *a`
`207`	`206`	`}`
`208`	`207`	`}`
`209`	`208`	`for (uint8_t i = 0; i < items; i++)`
	`209`	`+ {`
`210`	`210`	`atc_free(atc->searchCmd[i]);`
	`211`	`+ atc->searchCmd[i] = NULL;`
	`212`	`+ }`
`211`	`213`	`atc_unlock(atc);`
`212`	`214`	`return foundIndex;`
`213`	`215`	`}`