event-rule: Normalize pattern for syscall and tracepoint

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: If5bae2cd5df76db3f9bd626f95fcace114fcc420

diff --git a/src/common/event-rule/syscall.c b/src/common/event-rule/syscall.c
index 8103eaa6131f64b97b125bc9b2ada4d619f77dac..fbaa65310a6966548690bbb7db65c9c6ca91712b 100644 (file)
--- a/src/common/event-rule/syscall.c
+++ b/src/common/event-rule/syscall.c
@@ -14,6 +14,7 @@
 #include <common/runas.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
 #include <common/runas.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>

+#include <common/string-utils/string-utils.h>

 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/syscall-internal.h>
 
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/syscall-internal.h>
 


@@ -414,9 +415,9 @@ enum lttng_event_rule_status lttng_event_rule_syscall_set_pattern(
                goto end;
        }
 
                goto end;
        }
 

-       if (syscall->pattern) {
-               free(syscall->pattern);
-       }
+       strutils_normalize_star_glob_pattern(pattern_copy);
+
+       free(syscall->pattern);

 
        syscall->pattern = pattern_copy;
        pattern_copy = NULL;
 
        syscall->pattern = pattern_copy;
        pattern_copy = NULL;

diff --git a/src/common/event-rule/tracepoint.c b/src/common/event-rule/tracepoint.c
index 62a53f9783de0626a150e13a9529120fa6fa02fe..65e2c16a70edeae1ef500de81a46c8b711c6eb9a 100644 (file)
--- a/src/common/event-rule/tracepoint.c
+++ b/src/common/event-rule/tracepoint.c
@@ -15,6 +15,7 @@
 #include <common/runas.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
 #include <common/runas.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>

+#include <common/string-utils/string-utils.h>

 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/log-level-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/log-level-rule.h>


@@ -952,6 +953,9 @@ enum lttng_event_rule_status lttng_event_rule_tracepoint_set_pattern(
                goto end;
        }
 
                goto end;
        }
 

+       /* Normalize the pattern. */
+       strutils_normalize_star_glob_pattern(pattern_copy);
+

        free(tracepoint->pattern);
 
        tracepoint->pattern = pattern_copy;
        free(tracepoint->pattern);
 
        tracepoint->pattern = pattern_copy;