proto-shell: use calloc_a
authorFelix Fietkau <nbd@openwrt.org>
Sat, 5 Jan 2013 15:13:29 +0000 (16:13 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 5 Jan 2013 15:13:29 +0000 (16:13 +0100)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
proto-shell.c

index 038fb0b8ff7e980babed5934386a114de6277f19..02f1836d8da4764fb37ff82cd014fff739afa431 100644 (file)
@@ -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;