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

mraa.c: mraa_deinit make plat pointer NULL after freeing it

Browse Source 
This fixes #698 where an application will crash after calling mraa_deinit and
later closing calling deinit again because of the gcc destructor argument
introduced with cac8f7a

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2017-04-06 20:40:17 +02:00
parent f911e0620e
commit 6d004ca80d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mraa.c
View File

@@ -247,6 +247,7 @@ mraa_deinit()
if (plat->platform_type == MRAA_JSON_PLATFORM) { if (plat->platform_type == MRAA_JSON_PLATFORM) {
// Free the platform name // Free the platform name
free(plat->platform_name); free(plat->platform_name);
plat->platform_name = NULL;
// Free the UART device path // Free the UART device path
for (i = 0; i < plat->uart_dev_count; i++) { for (i = 0; i < plat->uart_dev_count; i++) {
@@ -257,15 +258,21 @@ mraa_deinit()
} }
#endif #endif
free(plat); free(plat);
plat = NULL;
if (lang_func != NULL) if (lang_func != NULL) {
free(lang_func); free(lang_func);
lang_func = NULL;
}
if (platform_name != NULL) if (platform_name != NULL) {
free(platform_name); free(platform_name);
platform_name = NULL;
}
} }
if (plat_iio != NULL) { if (plat_iio != NULL) {
free(plat_iio); free(plat_iio);
plat_iio = NULL;
} }
closelog(); closelog();
} }