Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

mraa.c: Fixed memleak of device_path for IEI_TANK

Browse Source 
Unfortunately the device_path char* is dynamically allocated
and #defined and const char *'ed depending on how each platform provided the
uart device paths which makes cleaning it up more complicated.

Added a check for the IEI_TANK.

Removed the char** (in favor of a char*) for mraa_find_uart_bus_pci.)

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2018-06-14 15:16:16 -07:00
parent 4c4845b101
commit 17342cbbbb
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mraa_internal.h
View File

@@ -176,7 +176,7 @@ int mraa_find_i2c_bus_pci(const char* pci_device, const char *pci_id, const char
* @param dev_name as retrieved from pci_dev_path * @param dev_name as retrieved from pci_dev_path
* @return Result of the operation * @return Result of the operation
*/ */
mraa_result_t mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name); mraa_result_t mraa_find_uart_bus_pci(const char* pci_dev_path, char* dev_name);
#if defined(IMRAA) #if defined(IMRAA)
/** /**

17
src/mraa.c
View File

@@ -289,8 +289,13 @@ mraa_deinit()
} }
int i = 0; int i = 0;
// Free the UART device path /* Free the UART device path. Note, some platforms dynamically
if ((plat->platform_type == MRAA_JSON_PLATFORM) || (plat->platform_type == MRAA_UP2)) { * allocate space for device_path, others use #defines or consts,
* which means this has to be handled differently per platform
*/
if ((plat->platform_type == MRAA_JSON_PLATFORM) ||
(plat->platform_type == MRAA_UP2) ||
(plat->platform_type == MRAA_IEI_TANK)) {
for (i = 0; i < plat->uart_dev_count; i++) { for (i = 0; i < plat->uart_dev_count; i++) {
if (plat->uart_dev[i].device_path != NULL) { if (plat->uart_dev[i].device_path != NULL) {
free(plat->uart_dev[i].device_path); free(plat->uart_dev[i].device_path);
@@ -1137,7 +1142,7 @@ mraa_link_targets(const char* filename, const char* targetname)
} }
mraa_result_t mraa_result_t
mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name) mraa_find_uart_bus_pci(const char* pci_dev_path, char* dev_name)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
const int max_allowable_len = 16; const int max_allowable_len = 16;
@@ -1153,14 +1158,14 @@ mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name)
return MRAA_ERROR_INVALID_RESOURCE; return MRAA_ERROR_INVALID_RESOURCE;
} }
*dev_name = (char*) malloc(sizeof(char) * max_allowable_len); dev_name = (char*) malloc(sizeof(char) * max_allowable_len);
snprintf(*dev_name, max_allowable_len, "/dev/%s", namelist[n - 1]->d_name); snprintf(dev_name, max_allowable_len, "/dev/%s", namelist[n - 1]->d_name);
while (n--) { while (n--) {
free(namelist[n]); free(namelist[n]);
} }
free(namelist); free(namelist);
syslog(LOG_INFO, "UART device: %s selected for initialization", *dev_name); syslog(LOG_INFO, "UART device: %s selected for initialization", dev_name);
return MRAA_SUCCESS; return MRAA_SUCCESS;
} }