projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Handle SIGBUS in sessiond and consumerd
[lttng-tools.git]
/
src
/
common
/
trigger.c
diff --git
a/src/common/trigger.c
b/src/common/trigger.c
index a86295069a85c12d1b17ee8bbaa3ade4643fa29c..d740c80c77a377f8ff1a9a7141f6e7682e67cb62 100644
(file)
--- a/
src/common/trigger.c
+++ b/
src/common/trigger.c
@@
-346,7
+346,12
@@
LTTNG_HIDDEN
bool lttng_trigger_is_equal(
const struct lttng_trigger *a, const struct lttng_trigger *b)
{
bool lttng_trigger_is_equal(
const struct lttng_trigger *a, const struct lttng_trigger *b)
{
- if (strcmp(a->name, b->name) != 0) {
+ if (!!a->name != !!b->name) {
+ /* Both must be either anonymous or named. */
+ return false;
+ }
+
+ if (a->name && strcmp(a->name, b->name) != 0) {
return false;
}
return false;
}
@@
-366,22
+371,24
@@
bool lttng_trigger_is_equal(
return true;
}
return true;
}
+LTTNG_HIDDEN
enum lttng_trigger_status lttng_trigger_set_name(struct lttng_trigger *trigger,
const char* name)
{
char *name_copy = NULL;
enum lttng_trigger_status status = LTTNG_TRIGGER_STATUS_OK;
enum lttng_trigger_status lttng_trigger_set_name(struct lttng_trigger *trigger,
const char* name)
{
char *name_copy = NULL;
enum lttng_trigger_status status = LTTNG_TRIGGER_STATUS_OK;
- if (!trigger || !name ||
- strlen(name) == 0) {
+ if (!trigger) {
status = LTTNG_TRIGGER_STATUS_INVALID;
goto end;
}
status = LTTNG_TRIGGER_STATUS_INVALID;
goto end;
}
- name_copy = strdup(name);
- if (!name_copy) {
- status = LTTNG_TRIGGER_STATUS_ERROR;
- goto end;
+ if (name) {
+ name_copy = strdup(name);
+ if (!name_copy) {
+ status = LTTNG_TRIGGER_STATUS_ERROR;
+ goto end;
+ }
}
free(trigger->name);
}
free(trigger->name);
This page took
0.025941 seconds
and
4
git commands to generate.