[PATCH 2/5] trace-cmd: Fix NULL pointer being passed to memcpy
From: Michael Sartain
Date: Sat Aug 12 2017 - 13:36:58 EST
Signed-off-by: Michael Sartain <mikesart@xxxxxxxxxxxx>
---
trace-output.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/trace-output.c b/trace-output.c
index bfe6331..84b21b0 100644
--- a/trace-output.c
+++ b/trace-output.c
@@ -929,7 +929,11 @@ tracecmd_add_option(struct tracecmd_output *handle,
free(option);
return NULL;
}
- memcpy(option->data, data, size);
+
+ /* Some IDs (like TRACECMD_OPTION_TRACECLOCK) pass NULL data */
+ if (data)
+ memcpy(option->data, data, size);
+
list_add_tail(&option->list, &handle->options);
return option;
--
2.13.2