projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify free() of channel attribute
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index b94fe68da09132baba598728b52dc6340598d1c9..d443d7926b7d9c25fc1b3dcdcbb8b1ced0bc97a4 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-1810,7
+1810,7
@@
static int _cmd_enable_event(struct ltt_session *session,
int wpipe, bool internal_event)
{
int ret, channel_created = 0;
int wpipe, bool internal_event)
{
int ret, channel_created = 0;
- struct lttng_channel *attr;
+ struct lttng_channel *attr
= NULL
;
assert(session);
assert(event);
assert(session);
assert(event);
@@
-1853,15
+1853,16
@@
static int _cmd_enable_event(struct ltt_session *session,
ret = LTTNG_ERR_FATAL;
goto error;
}
ret = LTTNG_ERR_FATAL;
goto error;
}
- strncpy(attr->name, channel_name, sizeof(attr->name));
+ if (lttng_strncpy(attr->name, channel_name,
+ sizeof(attr->name))) {
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
ret = cmd_enable_channel(session, domain, attr, wpipe);
if (ret != LTTNG_OK) {
ret = cmd_enable_channel(session, domain, attr, wpipe);
if (ret != LTTNG_OK) {
- free(attr);
goto error;
}
goto error;
}
- free(attr);
-
channel_created = 1;
}
channel_created = 1;
}
@@
-1990,14
+1991,16
@@
static int _cmd_enable_event(struct ltt_session *session,
ret = LTTNG_ERR_FATAL;
goto error;
}
ret = LTTNG_ERR_FATAL;
goto error;
}
- strncpy(attr->name, channel_name, sizeof(attr->name));
+ if (lttng_strncpy(attr->name, channel_name,
+ sizeof(attr->name))) {
+ ret = LTTNG_ERR_INVALID;
+ goto error;
+ }
ret = cmd_enable_channel(session, domain, attr, wpipe);
if (ret != LTTNG_OK) {
ret = cmd_enable_channel(session, domain, attr, wpipe);
if (ret != LTTNG_OK) {
- free(attr);
goto error;
}
goto error;
}
- free(attr);
/* Get the newly created channel reference back */
uchan = trace_ust_find_channel_by_name(
/* Get the newly created channel reference back */
uchan = trace_ust_find_channel_by_name(
@@
-2172,6
+2175,7
@@
error:
free(filter_expression);
free(filter);
free(exclusion);
free(filter_expression);
free(filter);
free(exclusion);
+ free(attr);
rcu_read_unlock();
return ret;
}
rcu_read_unlock();
return ret;
}
@@
-3661,9
+3665,6
@@
static int record_ust_snapshot(struct ltt_ust_session *usess,
case EINVAL:
ret = LTTNG_ERR_INVALID;
break;
case EINVAL:
ret = LTTNG_ERR_INVALID;
break;
- case ENODATA:
- ret = LTTNG_ERR_SNAPSHOT_NODATA;
- break;
default:
ret = LTTNG_ERR_SNAPSHOT_FAIL;
break;
default:
ret = LTTNG_ERR_SNAPSHOT_FAIL;
break;
This page took
0.02442 seconds
and
4
git commands to generate.