From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 5 Jan 2013 15:13:29 +0000 (+0100)
Subject: proto-shell: use calloc_a
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=4108e7610019d63db6540de760feecf38c8b84dc;ds=sidebyside

proto-shell: use calloc_a

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

diff --git a/proto-shell.c b/proto-shell.c
index 038fb0b..02f1836 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -813,15 +813,12 @@ proto_shell_add_handler(const char *script, json_object *obj)
 
 	name = json_object_get_string(tmp);
 
-	handler = calloc(1, sizeof(*handler) +
-			 strlen(script) + 1 +
-			 strlen(name) + 1);
+	handler = calloc_a(sizeof(*handler) + strlen(script) + 1,
+			   &str, strlen(name) + 1);
 	if (!handler)
 		return;
 
 	strcpy(handler->script_name, script);
-
-	str = handler->script_name + strlen(handler->script_name) + 1;
 	strcpy(str, name);
 
 	proto = &handler->proto;