more input validation

[project/uci.git] / file.c

diff --git a/file.c b/file.c
index 772cf255119ebf9156a34458dcafc2540c06f85d..e6722b256314e2a819cfdc438159d0c62604c7c2 100644 (file)
--- a/file.c
+++ b/file.c
@@ -27,6 +27,15 @@
 #define LINEBUF        32
 #define LINEBUF_MAX    4096
 
+static void uci_parse_error(struct uci_context *ctx, char *pos, char *reason)
+{
+       struct uci_parse_context *pctx = ctx->pctx;
+
+       pctx->reason = reason;
+       pctx->byte = pos - pctx->buf;
+       UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
 /*
  * Fetch a new line from the input stream and resize buffer if necessary
  */
@@ -57,11 +66,8 @@ static void uci_getln(struct uci_context *ctx, int offset)
                        return;
                }
 
-               if (pctx->bufsz > LINEBUF_MAX/2) {
-                       pctx->reason = "line too long";
-                       pctx->byte = LINEBUF_MAX;
-                       UCI_THROW(ctx, UCI_ERR_PARSE);
-               }
+               if (pctx->bufsz > LINEBUF_MAX/2)
+                       uci_parse_error(ctx, p, "line too long");
 
                pctx->bufsz *= 2;
                pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
@@ -166,9 +172,7 @@ static void parse_double_quote(struct uci_context *ctx, char **str, char **targe
                        break;
                }
        }
-       ctx->pctx->reason = "unterminated \"";
-       ctx->pctx->byte = *str - ctx->pctx->buf;
-       UCI_THROW(ctx, UCI_ERR_PARSE);
+       uci_parse_error(ctx, *str, "unterminated \"");
 }
 
 /*
@@ -190,9 +194,7 @@ static void parse_single_quote(struct uci_context *ctx, char **str, char **targe
                        addc(target, str);
                }
        }
-       ctx->pctx->reason = "unterminated '";
-       ctx->pctx->byte = *str - ctx->pctx->buf;
-       UCI_THROW(ctx, UCI_ERR_PARSE);
+       uci_parse_error(ctx, *str, "unterminated '");
 }
 
 /*
@@ -236,7 +238,7 @@ done:
 /*
  * extract the next argument from the command line
  */
-static char *next_arg(struct uci_context *ctx, char **str, bool required)
+static char *next_arg(struct uci_context *ctx, char **str, bool required, bool name)
 {
        char *val;
        char *ptr;
@@ -244,11 +246,10 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required)
        val = ptr = *str;
        skip_whitespace(ctx, str);
        parse_str(ctx, str, &ptr);
-       if (required && !*val) {
-               ctx->pctx->reason = "insufficient arguments";
-               ctx->pctx->byte = *str - ctx->pctx->buf;
-               UCI_THROW(ctx, UCI_ERR_PARSE);
-       }
+       if (required && !*val)
+               uci_parse_error(ctx, *str, "insufficient arguments");
+       if (name && !uci_validate_name(val))
+               uci_parse_error(ctx, val, "invalid character in field");
 
        return val;
 }
@@ -261,12 +262,9 @@ static void assert_eol(struct uci_context *ctx, char **str)
 {
        char *tmp;
 
-       tmp = next_arg(ctx, str, false);
-       if (tmp && *tmp) {
-               ctx->pctx->reason = "too many arguments";
-               ctx->pctx->byte = tmp - ctx->pctx->buf;
-               UCI_THROW(ctx, UCI_ERR_PARSE);
-       }
+       tmp = next_arg(ctx, str, false, false);
+       if (tmp && *tmp)
+               uci_parse_error(ctx, *str, "too many arguments");
 }
 
 /* 
@@ -297,14 +295,9 @@ static void uci_switch_config(struct uci_context *ctx)
         * if an older config under the same name exists, unload it
         * ignore errors here, e.g. if the config was not found
         */
-       UCI_TRAP_SAVE(ctx, ignore);
        e = uci_lookup_list(ctx, &ctx->root, name);
        if (e)
-               uci_unload(ctx, uci_to_package(e));
-       UCI_TRAP_RESTORE(ctx);
-ignore:
-       ctx->errno = 0;
-
+               UCI_THROW(ctx, UCI_ERR_DUPLICATE);
        pctx->package = uci_alloc_package(ctx, name);
 }
 
@@ -318,7 +311,7 @@ static void uci_parse_package(struct uci_context *ctx, char **str, bool single)
        /* command string null-terminated by strtok */
        *str += strlen(*str) + 1;
 
-       name = next_arg(ctx, str, true);
+       name = next_arg(ctx, str, true, true);
        assert_eol(ctx, str);
        if (single)
                return;
@@ -336,19 +329,17 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
        char *type = NULL;
 
        if (!ctx->pctx->package) {
-               if (!ctx->pctx->name) {
-                       ctx->pctx->byte = *str - ctx->pctx->buf;
-                       ctx->pctx->reason = "attempting to import a file without a package name";
-                       UCI_THROW(ctx, UCI_ERR_PARSE);
-               }
+               if (!ctx->pctx->name)
+                       uci_parse_error(ctx, *str, "attempting to import a file without a package name");
+
                uci_switch_config(ctx);
        }
 
        /* command string null-terminated by strtok */
        *str += strlen(*str) + 1;
 
-       type = next_arg(ctx, str, true);
-       name = next_arg(ctx, str, false);
+       type = next_arg(ctx, str, true, true);
+       name = next_arg(ctx, str, false, true);
        assert_eol(ctx, str);
        ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
 }
@@ -361,16 +352,14 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
        char *name = NULL;
        char *value = NULL;
 
-       if (!ctx->pctx->section) {
-               ctx->pctx->byte = *str - ctx->pctx->buf;
-               ctx->pctx->reason = "option command found before the first section";
-               UCI_THROW(ctx, UCI_ERR_PARSE);
-       }
+       if (!ctx->pctx->section)
+               uci_parse_error(ctx, *str, "option command found before the first section");
+
        /* command string null-terminated by strtok */
        *str += strlen(*str) + 1;
 
-       name = next_arg(ctx, str, true);
-       value = next_arg(ctx, str, true);
+       name = next_arg(ctx, str, true, true);
+       value = next_arg(ctx, str, true, false);
        assert_eol(ctx, str);
        uci_alloc_option(ctx->pctx->section, name, value);
 }
@@ -405,9 +394,7 @@ static void uci_parse_line(struct uci_context *ctx, bool single)
                                        uci_parse_option(ctx, &word);
                                break;
                        default:
-                               pctx->reason = "unterminated command";
-                               pctx->byte = word - pctx->buf;
-                               UCI_THROW(ctx, UCI_ERR_PARSE);
+                               uci_parse_error(ctx, word, "unterminated command");
                                break;
                }
        }
@@ -485,15 +472,14 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, stream != NULL);
 
-       if (package) {
+       if (package)
                uci_export_package(package, stream, header);
-               goto done;
+       else {
+               uci_foreach_element(&ctx->root, e) {
+                       uci_export_package(uci_to_package(e), stream, header);
+               }
        }
 
-       uci_foreach_element(&ctx->root, e) {
-               uci_export_package(uci_to_package(e), stream, header);
-       }
-done:
        return 0;
 }