From 4ec830fcc68e6aa4d2f04e94daad7f119bbc2dd1 Mon Sep 17 00:00:00 2001 From: Adelin Dobre Date: Tue, 8 Jan 2019 12:45:11 +0200 Subject: [PATCH] jsonplatform.c: Add fix for passing null as parameter Signed-off-by: Adelin Dobre Signed-off-by: Mihai Tudor Panu --- src/json/jsonplatform.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/json/jsonplatform.c b/src/json/jsonplatform.c index 8de6be3..fb82b2f 100644 --- a/src/json/jsonplatform.c +++ b/src/json/jsonplatform.c @@ -717,7 +717,13 @@ mraa_init_json_platform(const char* platform_json) // This one was allocated and assigned an "Unknown platform" value by now, // so we need to reallocate it. free(platform_name); - platform_name = calloc(strlen(plat->platform_name) + 1, sizeof(char)); + + if (!plat->platform_name) { + goto unsuccessful; + } else { + platform_name = calloc(strlen(plat->platform_name) + 1, sizeof(char)); + } + if (platform_name == NULL) { syslog(LOG_ERR, "init_json_platform: Could not allocate memory for platform_name"); goto unsuccessful;