fix a null pointer deref in uci_file_commit when overwriting history data

[uci.git] / ucimap.h

diff --git a/ucimap.h b/ucimap.h
index ccd6127bcd4a9ac164fdb55ab54d82638f8a5090..4f80111622234e1331da5c32db12337216357d3d 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -11,6 +11,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#ifndef __UCIMAP_H
+#define __UCIMAP_H
+
 #include <stdbool.h>
 #include "uci_list.h"
 #include "uci.h"
@@ -32,10 +35,46 @@
 #define TEST_BIT(_name, _bit) \
        (_name[(_bit) / 8] & (1 << ((_bit) % 8)))
 
+#ifndef __GNUC__
+#define __optmap_gen_type(_type, _field) -1
+#else
+
+#define __compatible(_type, _field, _newtype) \
+       __builtin_types_compatible_p(typeof(&(((_type *)0)->_field)), _newtype *)
+
+#define __list_compatible(_type, _field, __val, __else) \
+       __builtin_choose_expr(__compatible(_type, _field, struct ucimap_list *), __val, __else)
+
+#define __int_compatible(_type, _field, __val, __else) \
+       __builtin_choose_expr(__compatible(_type, _field, int), __val, \
+               __builtin_choose_expr(__compatible(_type, _field, unsigned int), __val, \
+                       __else))
+
+#define __string_compatible(_type, _field, __val, __else) \
+       __builtin_choose_expr(__compatible(_type, _field, char *), __val, \
+               __builtin_choose_expr(__compatible(_type, _field, unsigned char *), __val, \
+                       __builtin_choose_expr(__compatible(_type, _field, const char *), __val, \
+                               __builtin_choose_expr(__compatible(_type, _field, const unsigned char *), __val, \
+                                       __else))))
+
+#define __bool_compatible(_type, _field, __val, __else) \
+       __builtin_choose_expr(__compatible(_type, _field, bool), __val, __else)
+
+
+#define __optmap_gen_type(_type, _field) \
+       __list_compatible(_type, _field, UCIMAP_LIST, \
+       __int_compatible(_type, _field, UCIMAP_INT, \
+       __string_compatible(_type, _field, UCIMAP_STRING, \
+       __bool_compatible(_type, _field, UCIMAP_BOOL, \
+       -1))))
+
+#endif
+
 #define UCIMAP_OPTION(_type, _field) \
        .type = UCIMAP_CUSTOM, \
        .name = #_field, \
-       .offset = offsetof(_type, _field)
+       .offset = offsetof(_type, _field), \
+       .detected_type = __optmap_gen_type(_type, _field)
 
 
 #define UCIMAP_SECTION(_name, _field) \
@@ -51,6 +90,8 @@ struct uci_map {
        unsigned int n_sections;
        struct list_head sdata;
        struct list_head fixup;
+       struct list_head pending;
+       bool parsed;
 
        void *priv; /* user data */
 };
@@ -68,13 +109,18 @@ enum ucimap_type {
        UCIMAP_SECTION  = 0x3,
        UCIMAP_CUSTOM   = 0x4,
        UCIMAP_SUBTYPE  = 0xf, /* subtype mask */
+
+       /* automatically create lists from
+        * options with space-separated items */
+       UCIMAP_LIST_AUTO = 0x0100,
+       UCIMAP_FLAGS     = 0xff00, /* flags mask */
 };
 
 union ucimap_data {
        int i;
        bool b;
        char *s;
-       void *section;
+       void *ptr;
        struct ucimap_list *list;
 };
 
@@ -132,6 +178,7 @@ struct uci_optmap {
        unsigned int offset;
        const char *name;
        enum ucimap_type type;
+       int detected_type;
        int (*parse)(void *section, struct uci_optmap *om, union ucimap_data *data, const char *string);
        int (*format)(void *section, struct uci_optmap *om, union ucimap_data *data, char **string);
        union {
@@ -157,4 +204,6 @@ extern void ucimap_cleanup(struct uci_map *map);
 extern void ucimap_set_changed(struct ucimap_section_data *sd, void *field);
 extern int ucimap_store_section(struct uci_map *map, struct uci_package *p, struct ucimap_section_data *sd);
 extern void ucimap_parse(struct uci_map *map, struct uci_package *pkg);
+extern int ucimap_parse_section(struct uci_map *map, struct uci_sectionmap *sm, struct ucimap_section_data *sd, struct uci_section *s);
 
+#endif