uci: fix memory leak in rpc_uci_replace_savedir()

[project/rpcd.git] / file.c

diff --git a/file.c b/file.c
index 4920f50..a09e9de 100644 (file)
--- a/file.c
+++ b/file.c
@@ -2,6 +2,7 @@
  * rpcd - UBUS RPC server
  *
  *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2016 Luka Perkov <luka@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -93,6 +94,7 @@ static const struct blobmsg_policy rpc_file_rb_policy[__RPC_F_RB_MAX] = {
 enum {
        RPC_F_RW_PATH,
        RPC_F_RW_DATA,
+       RPC_F_RW_APPEND,
        RPC_F_RW_MODE,
        RPC_F_RW_BASE64,
        __RPC_F_RW_MAX,
@@ -101,6 +103,7 @@ enum {
 static const struct blobmsg_policy rpc_file_rw_policy[__RPC_F_RW_MAX] = {
        [RPC_F_RW_PATH]   = { .name = "path",   .type = BLOBMSG_TYPE_STRING },
        [RPC_F_RW_DATA]   = { .name = "data",   .type = BLOBMSG_TYPE_STRING },
+       [RPC_F_RW_APPEND] = { .name = "append", .type = BLOBMSG_TYPE_BOOL  },
        [RPC_F_RW_MODE]   = { .name = "mode",   .type = BLOBMSG_TYPE_INT32  },
        [RPC_F_RW_BASE64] = { .name = "base64", .type = BLOBMSG_TYPE_BOOL   },
 };
@@ -247,7 +250,7 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj,
                }
        }
 
-       *(wbuf + len) = 0;
+       *(wbuf + len) = '\0';
        blobmsg_add_string_buffer(&buf);
 
        ubus_send_reply(ctx, req, buf.head);
@@ -265,10 +268,11 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct blob_attr *tb[__RPC_F_RW_MAX];
+       int append = O_TRUNC;
        mode_t prev_mode, mode = 0666;
        int fd, rv = 0;
        void *data = NULL;
-       size_t data_len = 0;
+       ssize_t data_len = 0;
 
        blobmsg_parse(rpc_file_rw_policy, __RPC_F_RW_MAX, tb,
                      blob_data(msg), blob_len(msg));
@@ -279,11 +283,14 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
        data = blobmsg_data(tb[RPC_F_RW_DATA]);
        data_len = blobmsg_data_len(tb[RPC_F_RW_DATA]) - 1;
 
+       if (tb[RPC_F_RW_APPEND] && blobmsg_get_bool(tb[RPC_F_RW_APPEND]))
+               append = O_APPEND;
+
        if (tb[RPC_F_RW_MODE])
                mode = blobmsg_get_u32(tb[RPC_F_RW_MODE]);
 
        prev_mode = umask(0);
-       fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_WRONLY | O_TRUNC, mode);
+       fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_WRONLY | append, mode);
        umask(prev_mode);
        if (fd < 0)
                return rpc_errno_status();