From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 25 May 2014 19:04:46 +0000 (+0200)
Subject: service: fix memleak in trigger handling
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=396efd78d68310c90a9b2a18faaf46ad47f7509c;p=oweals%2Fprocd.git

service: fix memleak in trigger handling

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/service/trigger.c b/service/trigger.c
index b7bdbc5..f450401 100644
--- a/service/trigger.c
+++ b/service/trigger.c
@@ -88,13 +88,19 @@ static void q_job_run(struct runqueue *q, struct runqueue_task *t)
 	j->cmd->handler(j, j->exec, j->env);
 }
 
+static void trigger_free(struct trigger *t)
+{
+	free(t->data);
+	list_del(&t->list);
+	free(t);
+}
+
 static void q_job_complete(struct runqueue *q, struct runqueue_task *p)
 {
 	struct job *j = container_of(p, struct job, proc.task);
 
 	if (j->trigger->remove) {
-		list_del(&j->trigger->list);
-		free(j->trigger);
+		trigger_free(j->trigger);
 	} else {
 		j->trigger->pending = 0;
 	}
@@ -219,6 +225,7 @@ static void trigger_delay_cb(struct uloop_timeout *tout)
 
 	json_script_run(&t->jctx, "foo", t->data);
 	free(t->data);
+	t->data = NULL;
 }
 
 static struct trigger* _trigger_add(char *type, struct blob_attr *rule, int timeout, void *id)
@@ -302,8 +309,8 @@ void trigger_del(void *id)
 			t->remove = 1;
 			continue;
 		}
-		list_del(&t->list);
-		free(t);
+
+		trigger_free(t);
 	}
 }
 
@@ -323,6 +330,7 @@ void trigger_event(char *type, struct blob_attr *data)
 			continue;
 		if (!strcmp(t->type, type)) {
 			if (t->timeout) {
+				free(t->data);
 				t->data = blob_memdup(data);
 				uloop_timeout_set(&t->delay, t->timeout);
 			} else {