projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial import of the snapshot ABI/API in lttng-ctl
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
enable_events.c
diff --git
a/src/bin/lttng/commands/enable_events.c
b/src/bin/lttng/commands/enable_events.c
index 57837eb7dcadd3828110b7a7f386460ad491a570..18793ae095a77cbe8365f09ac0576a06011ea407 100644
(file)
--- a/
src/bin/lttng/commands/enable_events.c
+++ b/
src/bin/lttng/commands/enable_events.c
@@
-268,7
+268,11
@@
int loglevel_str_to_value(const char *inputstr)
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
- while (i < LTTNG_SYMBOL_NAME_LEN && inputstr[i] != '\0') {
+ /*
+ * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
+ * added at the end of the loop so a the upper bound we avoid the overflow.
+ */
+ while (i < (LTTNG_SYMBOL_NAME_LEN - 1) && inputstr[i] != '\0') {
str[i] = toupper(inputstr[i]);
i++;
}
str[i] = toupper(inputstr[i]);
i++;
}
@@
-438,7
+442,6
@@
static int enable_events(char *session_name)
ret = lttng_enable_event_with_filter(handle, &ev, channel_name,
opt_filter);
if (ret < 0) {
ret = lttng_enable_event_with_filter(handle, &ev, channel_name,
opt_filter);
if (ret < 0) {
- fprintf(stderr, "Ret filter: %d\n", ret);
switch (-ret) {
case LTTNG_ERR_FILTER_EXIST:
WARN("Filter on events is already enabled"
switch (-ret) {
case LTTNG_ERR_FILTER_EXIST:
WARN("Filter on events is already enabled"
@@
-447,9
+450,8
@@
static int enable_events(char *session_name)
break;
case LTTNG_ERR_FILTER_INVAL:
case LTTNG_ERR_FILTER_NOMEM:
break;
case LTTNG_ERR_FILTER_INVAL:
case LTTNG_ERR_FILTER_NOMEM:
- ERR("%s", lttng_strerror(ret));
default:
default:
- ERR("
Setting filter: '%s'", opt_filter
);
+ ERR("
%s", lttng_strerror(ret)
);
break;
}
goto error;
break;
}
goto error;
This page took
0.023706 seconds
and
4
git commands to generate.