add extra null pointer check

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index a70c2c5..d78970c 100644 (file)
--- a/list.c
+++ b/list.c
@@ -184,7 +184,7 @@ static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_l
                if (!strcmp(e->name, name))
                        return e;
        }
-       UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+       return NULL;
 }
 
 int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
@@ -196,17 +196,23 @@ int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_pac
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, res != NULL);
        UCI_ASSERT(ctx, p != NULL);
+       UCI_ASSERT(ctx, section != NULL);
 
        e = uci_lookup_list(ctx, &p->sections, section);
-       if (!option)
-               goto found;
+       if (!e)
+               goto notfound;
 
-       s = uci_to_section(e);
-       e = uci_lookup_list(ctx, &s->options, option);
+       if (option) {
+               s = uci_to_section(e);
+               e = uci_lookup_list(ctx, &s->options, option);
+       }
 
-found:
        *res = e;
        return 0;
+
+notfound:
+       UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+       return 0;
 }
 
 int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
@@ -215,6 +221,10 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
        char *str;
        struct uci_list *list;
        struct uci_element *e;
+       struct uci_package *p;
+       struct uci_section *s;
+       char *section;
+       char *option;
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, value != NULL);
@@ -235,14 +245,22 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
        switch(e->type) {
        case UCI_TYPE_SECTION:
                size = sizeof(struct uci_section);
+               s = uci_to_section(e);
+               section = e->name;
+               option = NULL;
                break;
        case UCI_TYPE_OPTION:
                size = sizeof(struct uci_option);
+               s = uci_to_option(e)->section;
+               section = s->e.name;
+               option = e->name;
                break;
        default:
                UCI_THROW(ctx, UCI_ERR_INVAL);
-               break;
+               return 0;
        }
+       p = s->package;
+       uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
 
        uci_list_del(&e->list);
        e = uci_realloc(ctx, e, size);
@@ -275,13 +293,13 @@ int uci_set(struct uci_context *ctx, char *package, char *section, char *option,
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, package != NULL);
        UCI_ASSERT(ctx, section != NULL);
+       UCI_ASSERT(ctx, value != NULL);
 
        /*
         * look up the package, section and option (if set)
         * if the section/option is to be modified and it is not found
         * create a new element in the appropriate list
         */
-       UCI_TRAP_SAVE(ctx, notfound);
        e = uci_lookup_list(ctx, &ctx->root, package);
        if (!e)
                goto notfound;
@@ -290,15 +308,14 @@ int uci_set(struct uci_context *ctx, char *package, char *section, char *option,
        e = uci_lookup_list(ctx, &p->sections, section);
        if (!e)
                goto notfound;
-       s = uci_to_section(e);
 
+       s = uci_to_section(e);
        if (option) {
                e = uci_lookup_list(ctx, &s->options, option);
                if (!e)
                        goto notfound;
                o = uci_to_option(e);
        }
-       UCI_TRAP_RESTORE(ctx);
 
        /* 
         * no unknown element was supplied, assume that we can just update 
@@ -309,7 +326,6 @@ int uci_set(struct uci_context *ctx, char *package, char *section, char *option,
        else
                e = &s->e;
 
-       uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
        return uci_set_element_value(ctx, &e, value);
 
 notfound:
@@ -320,14 +336,14 @@ notfound:
         * an option was supplied, but the section wasn't found
         */
        if (!p || (!s && option))
-               UCI_THROW(ctx, ctx->errno);
+               UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
        /* now add the missing entry */
        uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
        if (s)
                uci_alloc_option(s, option, value);
        else
-               uci_alloc_section(p, section, value);
+               uci_alloc_section(p, value, section);
 
        return 0;
 }