uci_delete: check ptr->o and its type before checking ptr->value

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index bf0f376..0ea7eda 100644 (file)
--- a/list.c
+++ b/list.c
@@ -217,7 +217,7 @@ uci_free_section(struct uci_section *s)
        uci_free_element(&s->e);
 }
 
-__plugin struct uci_package *
+__private struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
        struct uci_package *p;
@@ -515,12 +515,13 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
 {
        struct uci_package *p = s->package;
+       bool internal = ctx && ctx->internal;
        char order[32];
 
        UCI_HANDLE_ERR(ctx);
 
        uci_list_set_pos(&s->package->sections, &s->e.list, pos);
-       if (!ctx->internal && p->has_delta) {
+       if (!internal && p->has_delta) {
                sprintf(order, "%d", pos);
                uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
        }
@@ -559,7 +560,7 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 
        UCI_ASSERT(ctx, ptr->s);
 
-       if (ptr->value && ptr->o && ptr->o->type == UCI_TYPE_LIST) {
+       if (ptr->o && ptr->o->type == UCI_TYPE_LIST && ptr->value && *ptr->value) {
                if (!sscanf(ptr->value, "%d", &index))
                        return 1;