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

beaglebone.c: Fix resource leaks with capepath in error path

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2015-08-13 15:26:37 +01:00
parent 45133922aa
commit 832d7901d5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/arm/beaglebone.c
View File

@@ -196,15 +196,15 @@ mraa_beaglebone_uart_init_pre(int index)
} }
FILE* fh; FILE* fh;
fh = fopen(capepath, "w"); fh = fopen(capepath, "w");
free(capepath);
if (fh == NULL) { if (fh == NULL) {
syslog(LOG_ERR, "uart: Failed to open %s for writing, check access rights for user", capepath); syslog(LOG_ERR, "uart: Failed to open capepath for writing, check access rights for user");
return ret; return ret;
} }
if (fprintf(fh, UART_OVERLAY(index + 1)) < 0) { if (fprintf(fh, UART_OVERLAY(index + 1)) < 0) {
syslog(LOG_ERR, "uart: Failed to write to CapeManager"); syslog(LOG_ERR, "uart: Failed to write to CapeManager");
} }
fclose(fh); fclose(fh);
free(capepath);
} }
if (mraa_file_exist(devpath)) if (mraa_file_exist(devpath))
ret = MRAA_SUCCESS; ret = MRAA_SUCCESS;
@@ -246,8 +246,9 @@ mraa_beaglebone_spi_init_pre(int index)
} }
FILE* fh; FILE* fh;
fh = fopen(capepath, "w"); fh = fopen(capepath, "w");
free(capepath);
if (fh == NULL) { if (fh == NULL) {
syslog(LOG_ERR, "spi: Failed to open %s for writing, check access rights for user", capepath); syslog(LOG_ERR, "spi: Failed to open capepath for writing, check access rights for user");
return ret; return ret;
} }
if (fprintf(fh, SPI_OVERLAY(index)) < 0) { if (fprintf(fh, SPI_OVERLAY(index)) < 0) {
@@ -256,7 +257,6 @@ mraa_beaglebone_spi_init_pre(int index)
SPI_OVERLAY(index)); SPI_OVERLAY(index));
} }
fclose(fh); fclose(fh);
free(capepath);
} }
if (mraa_file_exist(devpath)) { if (mraa_file_exist(devpath)) {
plat->spi_bus[index].bus_id = deviceindex; plat->spi_bus[index].bus_id = deviceindex;
@@ -284,8 +284,9 @@ mraa_beaglebone_i2c_init_pre(unsigned int bus)
} }
FILE* fh; FILE* fh;
fh = fopen(capepath, "w"); fh = fopen(capepath, "w");
free(capepath);
if (fh == NULL) { if (fh == NULL) {
syslog(LOG_ERR, "i2c: Failed to open %s for writing, check access rights for user", capepath); syslog(LOG_ERR, "i2c: Failed to open capepath for writing, check access rights for user");
return ret; return ret;
} }
if (fprintf(fh, "ADAFRUIT-I2C%d", bus) < 0) { if (fprintf(fh, "ADAFRUIT-I2C%d", bus) < 0) {
@@ -327,8 +328,9 @@ mraa_beaglebone_pwm_init_replace(int pin)
return NULL; return NULL;
} }
fh = fopen(capepath, "w"); fh = fopen(capepath, "w");
free(capepath);
if (fh == NULL) { if (fh == NULL) {
syslog(LOG_ERR, "pwm: Failed to open %s for writing, check access rights for user", capepath); syslog(LOG_ERR, "pwm: Failed to open %s for writing, check access rights for user");
return NULL; return NULL;
} }
if (fprintf(fh, SYSFS_PWM_OVERLAY) < 0) { if (fprintf(fh, SYSFS_PWM_OVERLAY) < 0) {