aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYordan Karadzhov (VMware) <y.karadz@gmail.com>2019-07-09 18:56:43 +0300
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-07-09 21:00:44 -0400
commitd1ddcdba713491fd779a26fc1db6245dc5d61c7d (patch)
treee02e83b496e4b885a7d61b656e94c0b8de711a9f
parenteba17becd5f0181cb66919815b3fefdf4563bb4b (diff)
downloadtrace-cmd-d1ddcdba713491fd779a26fc1db6245dc5d61c7d.tar.gz
kernel-shark: Don't free the string field of KS_CONFIG_STRING document
In kshark_config_doc_get() if the outputted document is of type KS_CONFIG_STRING, do not try to free the old string before setting the new one. Note that those strings are owned by the json object. Link: http://lore.kernel.org/linux-trace-devel/20190709155650.2345-2-y.karadz@gmail.com Fixes: b3b5b6504b1 ("kernel-shark-qt: Add I/O for configuration data.") Reported-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel-shark/src/libkshark-configio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-shark/src/libkshark-configio.c b/kernel-shark/src/libkshark-configio.c
index 91065227..cac27a78 100644
--- a/kernel-shark/src/libkshark-configio.c
+++ b/kernel-shark/src/libkshark-configio.c
@@ -310,7 +310,6 @@ bool kshark_config_doc_get(struct kshark_config_doc *conf,
if (!get_jval(conf, key, &tmp->conf_doc))
goto fail;
- free(val->conf_doc);
val->conf_doc =
(char *) json_object_get_string(tmp->conf_doc);
free(tmp);