trigger: fix memory leak in script calls

[project/procd.git] / service / trigger.c

diff --git a/service/trigger.c b/service/trigger.c
index a8533b3..fb249b6 100644 (file)
--- a/service/trigger.c
+++ b/service/trigger.c
@@ -77,6 +77,9 @@ rule_load_script(struct json_script_ctx *ctx, const char *name)
 {
        struct trigger *t = container_of(ctx, struct trigger, jctx);
 
+       if (strcmp(name, t->type) != 0)
+               return NULL;
+
        return json_script_file_from_blobmsg(t->type, t->rule, blob_pad_len(t->rule));
 }
 
@@ -225,7 +228,7 @@ static void trigger_delay_cb(struct uloop_timeout *tout)
 {
        struct trigger *t = container_of(tout, struct trigger, delay);
 
-       json_script_run(&t->jctx, "foo", t->data);
+       json_script_run(&t->jctx, t->type, t->data);
        free(t->data);
        t->data = NULL;
 }
@@ -323,12 +326,12 @@ void trigger_init(void)
        q.max_running_tasks = 1;
 }
 
-static int trigger_match(const char *event, const char *match)
+static bool trigger_match(const char *event, const char *match)
 {
        char *wildcard = strstr(match, ".*");
        if (wildcard)
-               return strncmp(event, match, wildcard - match);
-       return strcmp(event, match);
+               return !strncmp(event, match, wildcard - match);
+       return !strcmp(event, match);
 }
 
 void trigger_event(const char *type, struct blob_attr *data)
@@ -338,13 +341,13 @@ void trigger_event(const char *type, struct blob_attr *data)
        list_for_each_entry(t, &triggers, list) {
                if (t->remove)
                        continue;
-               if (!trigger_match(type, t->type)) {
+               if (trigger_match(type, t->type)) {
                        if (t->timeout) {
                                free(t->data);
                                t->data = blob_memdup(data);
                                uloop_timeout_set(&t->delay, t->timeout);
                        } else {
-                               json_script_run(&t->jctx, "foo", data);
+                               json_script_run(&t->jctx, t->type, data);
                        }
                }
        }