remove internal usage of redundant uci_ptr.last

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index c9b23d4bbd2f98d2d08838e02a0ae7cf7ff2a2f8..6610f531c2f64852b032e9ead2ec30b35d61873a 100644 (file)
--- a/file.c
+++ b/file.c
@@ -64,6 +64,7 @@ __private void uci_getln(struct uci_context *ctx, size_t offset)
                        return;
 
                ofs += strlen(p);
+               pctx->buf_filled = ofs;
                if (pctx->buf[ofs - 1] == '\n') {
                        pctx->line++;
                        return;
@@ -121,6 +122,15 @@ static inline void addc(struct uci_context *ctx, size_t *pos_dest, size_t *pos_s
        *pos_src += 1;
 }
 
+static int uci_increase_pos(struct uci_parse_context *pctx, size_t add)
+{
+       if (pctx->pos + add > pctx->buf_filled)
+               return -EINVAL;
+
+       pctx->pos += add;
+       return 0;
+}
+
 /*
  * parse a double quoted string argument from the command line
  */
@@ -385,7 +395,8 @@ static void uci_parse_package(struct uci_context *ctx, bool single)
        char *name;
 
        /* command string null-terminated by strtok */
-       pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
+       if (uci_increase_pos(pctx, strlen(pctx_cur_str(pctx)) + 1))
+               uci_parse_error(ctx, "package without name");
 
        ofs_name = next_arg(ctx, true, true, true);
        assert_eol(ctx);
@@ -417,7 +428,8 @@ static void uci_parse_config(struct uci_context *ctx)
        }
 
        /* command string null-terminated by strtok */
-       pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
+       if (uci_increase_pos(pctx, strlen(pctx_cur_str(pctx)) + 1))
+               uci_parse_error(ctx, "config without name");
 
        ofs_type = next_arg(ctx, true, false, false);
        type = pctx_str(pctx, ofs_type);
@@ -447,7 +459,7 @@ static void uci_parse_config(struct uci_context *ctx)
 
                ctx->internal = !pctx->merge;
                UCI_NESTED(uci_set, ctx, &ptr);
-               pctx->section = uci_to_section(ptr.last);
+               pctx->section = ptr.s;
        }
 }
 
@@ -467,7 +479,8 @@ static void uci_parse_option(struct uci_context *ctx, bool list)
                uci_parse_error(ctx, "option/list command found before the first section");
 
        /* command string null-terminated by strtok */
-       pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
+       if (uci_increase_pos(pctx, strlen(pctx_cur_str(pctx)) + 1))
+               uci_parse_error(ctx, "option without name");
 
        ofs_name = next_arg(ctx, true, true, false);
        ofs_value = next_arg(ctx, false, false, false);