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

mraa.c: Fix strsep crash

Browse Source 
Variable 'dup' doesn't get freed correctly as the pointer to it changes
after 'strsep' function is used. Also 'token' variable doesn't need to
be freed as freeing the original 'dup' already frees the same memory.

Signed-off-by: Simo Kuusela <simo.kuusela@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Simo Kuusela
2017-03-14 11:27:30 +02:00
committed by Brendan Le Foll
parent 1c4b1fc329
commit b24e90db0c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mraa.c
View File

@@ -947,7 +947,8 @@ mraa_find_i2c_bus_pci(const char* pci_device, const char *pci_id, const char* ad
}
else {
while (n--) {
char* dup = strdup(namelist[n]->d_name);
char* dup = strdup(namelist[n]->d_name);
char* orig_dup = dup;
if (dup == NULL) {
syslog(LOG_ERR, "Ran out of memory!");
break;
@@ -961,22 +962,20 @@ mraa_find_i2c_bus_pci(const char* pci_device, const char *pci_id, const char* ad
if (token != NULL) {
int ret = -1;
if (mraa_atoi(token, &ret) == MRAA_SUCCESS) {
free(dup);
free(orig_dup);
free(namelist[n]);
free(namelist);
syslog(LOG_NOTICE, "Adding i2c bus found on i2c-%d on adapter %s", ret, adapter_name);
return ret;
}
free(dup);
free(orig_dup);
free(namelist[n]);
free(namelist);
return -1;
}
}
free(token);
} else {
free(dup);
}
free(orig_dup);
free(namelist[n]);
}
free(namelist);