summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-09-04 14:46:49 +0200
committerJohn Crispin <blogic@openwrt.org>2013-09-13 17:35:55 +0200
commit72c21573149f77c4afa41afb0f5216c2ab1555ea (patch)
tree6257ebfb344f8826b49bea2bdbd713ac56885804
parent11a65fae34ee7900453c079eb80755f135395258 (diff)
downloadunitd-72c21573149f77c4afa41afb0f5216c2ab1555ea.tar
unitd-72c21573149f77c4afa41afb0f5216c2ab1555ea.zip
fix a bug in the trigger handling code
Signed-off-by: John Crispin <blogic@openwrt.org>
-rw-r--r--instance.c4
-rw-r--r--service.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/instance.c b/instance.c
index e6fc331..4230d0d 100644
--- a/instance.c
+++ b/instance.c
@@ -339,10 +339,10 @@ instance_config_parse(struct service_instance *in)
in->respawn_retry = vals[2];
}
if (tb[INSTANCE_ATTR_TRIGGER]) {
- in->trigger = malloc(blob_len(tb[INSTANCE_ATTR_TRIGGER]));
+ in->trigger = malloc(blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
if (!in->trigger)
return -1;
- memcpy(in->trigger, tb[INSTANCE_ATTR_TRIGGER], blob_len(tb[INSTANCE_ATTR_TRIGGER]));
+ memcpy(in->trigger, tb[INSTANCE_ATTR_TRIGGER], blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
trigger_add(in->trigger, in);
}
diff --git a/service.c b/service.c
index 5647ae5..7776f99 100644
--- a/service.c
+++ b/service.c
@@ -108,10 +108,10 @@ service_update(struct service *s, struct blob_attr *config, struct blob_attr **t
}
if (tb[SERVICE_SET_TRIGGER] && blobmsg_data_len(tb[SERVICE_SET_TRIGGER])) {
- s->trigger = malloc(blob_len(tb[SERVICE_SET_TRIGGER]));
+ s->trigger = malloc(blob_pad_len(tb[SERVICE_SET_TRIGGER]));
if (!s->trigger)
return -1;
- memcpy(s->trigger, tb[SERVICE_SET_TRIGGER], blob_len(tb[SERVICE_SET_TRIGGER]));
+ memcpy(s->trigger, tb[SERVICE_SET_TRIGGER], blob_pad_len(tb[SERVICE_SET_TRIGGER]));
trigger_add(s->trigger, s);
}