projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Memory allocated by xmlNodeGetContent() must be freed by xmlFree()
[lttng-tools.git]
/
src
/
common
/
config
/
config.c
diff --git
a/src/common/config/config.c
b/src/common/config/config.c
index e5c1da13285af002f39e34d2715f036c9c40d375..b2a0912b8f5531d75c530875e5593812335803b8 100644
(file)
--- a/
src/common/config/config.c
+++ b/
src/common/config/config.c
@@
-2158,7
+2158,7
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
{
int ret, started = -1, snapshot_mode = -1;
uint64_t live_timer_interval = UINT64_MAX;
{
int ret, started = -1, snapshot_mode = -1;
uint64_t live_timer_interval = UINT64_MAX;
-
c
har *name = NULL;
+
xmlC
har *name = NULL;
xmlNodePtr domains_node = NULL;
xmlNodePtr output_node = NULL;
xmlNodePtr node;
xmlNodePtr domains_node = NULL;
xmlNodePtr output_node = NULL;
xmlNodePtr node;
@@
-2177,7
+2177,7
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
goto error;
}
goto error;
}
- name =
(char *)
node_content;
+ name = node_content;
} else if (!domains_node && !strcmp((const char *) node->name,
config_element_domains)) {
/* domains */
} else if (!domains_node && !strcmp((const char *) node->name,
config_element_domains)) {
/* domains */
@@
-2247,7
+2247,7
@@
int process_session_node(xmlNodePtr session_node, const char *session_name,
goto error;
}
goto error;
}
- if (session_name && strcmp(name, session_name)) {
+ if (session_name && strcmp(
(char *)
name, session_name)) {
/* This is not the session we are looking for */
ret = -LTTNG_ERR_NO_SESSION;
goto error;
/* This is not the session we are looking for */
ret = -LTTNG_ERR_NO_SESSION;
goto error;
@@
-2304,7
+2304,7
@@
domain_init_error:
if (override) {
/* Destroy session if it exists */
if (override) {
/* Destroy session if it exists */
- ret = lttng_destroy_session(name);
+ ret = lttng_destroy_session(
(const char *)
name);
if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
ERR("Failed to destroy existing session.");
goto error;
if (ret && ret != -LTTNG_ERR_SESS_NOT_FOUND) {
ERR("Failed to destroy existing session.");
goto error;
@@
-2313,15
+2313,17
@@
domain_init_error:
/* Create session type depending on output type */
if (snapshot_mode && snapshot_mode != -1) {
/* Create session type depending on output type */
if (snapshot_mode && snapshot_mode != -1) {
- ret = create_snapshot_session(name, output_node);
+ ret = create_snapshot_session(
(const char *)
name, output_node);
} else if (live_timer_interval &&
live_timer_interval != UINT64_MAX) {
} else if (live_timer_interval &&
live_timer_interval != UINT64_MAX) {
- ret = create_session(name, kernel_domain, ust_domain, jul_domain,
- output_node, live_timer_interval);
+ ret = create_session((const char *) name, kernel_domain,
+ ust_domain, jul_domain, output_node,
+ live_timer_interval);
} else {
/* regular session */
} else {
/* regular session */
- ret = create_session(name, kernel_domain, ust_domain, jul_domain,
- output_node, UINT64_MAX);
+ ret = create_session((const char *) name, kernel_domain,
+ ust_domain, jul_domain, output_node,
+ UINT64_MAX);
}
if (ret) {
goto error;
}
if (ret) {
goto error;
@@
-2329,14
+2331,14
@@
domain_init_error:
for (node = xmlFirstElementChild(domains_node); node;
node = xmlNextElementSibling(node)) {
for (node = xmlFirstElementChild(domains_node); node;
node = xmlNextElementSibling(node)) {
- ret = process_domain_node(node, name);
+ ret = process_domain_node(node,
(const char *)
name);
if (ret) {
goto end;
}
}
if (started) {
if (ret) {
goto end;
}
}
if (started) {
- ret = lttng_start_tracing(name);
+ ret = lttng_start_tracing(
(const char *)
name);
if (ret) {
goto end;
}
if (ret) {
goto end;
}
@@
-2344,15
+2346,16
@@
domain_init_error:
end:
if (ret < 0) {
end:
if (ret < 0) {
- ERR("Failed to load session %s: %s", name, lttng_strerror(ret));
- lttng_destroy_session(name);
+ ERR("Failed to load session %s: %s", (const char *) name,
+ lttng_strerror(ret));
+ lttng_destroy_session((const char *) name);
}
error:
free(kernel_domain);
free(ust_domain);
free(jul_domain);
}
error:
free(kernel_domain);
free(ust_domain);
free(jul_domain);
-
f
ree(name);
+
xmlF
ree(name);
return ret;
}
return ret;
}
This page took
0.025175 seconds
and
4
git commands to generate.