diff options
| author | Maria Matejka <mq@ucw.cz> | 2023-06-17 10:16:28 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2023-09-12 16:10:42 +0200 |
| commit | 39f8f46d81203ebd6b976da56e83930f972dccab (patch) | |
| tree | eebe06449220e918fdc9ce71d072d19530ce2d1e /filter | |
| parent | 6f798683a34aa87f5e4f590be4c90253a1135e08 (diff) | |
| download | bird-39f8f46d81203ebd6b976da56e83930f972dccab.tar.gz | |
Uninitialized filter variables of path/[el]?clist types are now explicitly empty
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/config.Y | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/filter/config.Y b/filter/config.Y index 6a39ef0c..6391569b 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -225,34 +225,22 @@ f_new_lc_item(u32 f1, u32 t1, u32 f2, u32 t2, u32 f3, u32 t3) } static inline struct f_inst * -f_const_empty(struct f_dynamic_attr dyn) +f_const_empty(enum f_type t) { - struct f_val empty; - - switch (dyn.type) { - case EAF_TYPE_AS_PATH: - case EAF_TYPE_INT_SET: - case EAF_TYPE_EC_SET: - case EAF_TYPE_LC_SET: - empty = (struct f_val) { - .type = dyn.f_type, + switch (t) { + case T_PATH: + case T_CLIST: + case T_ECLIST: + case T_LCLIST: + return f_new_inst(FI_CONSTANT, (struct f_val) { + .type = t, .val.ad = &null_adata, - }; - break; + }); default: - cf_error("Can't empty that attribute"); + return f_new_inst(FI_CONSTANT, (struct f_val) {}); } - - return f_new_inst(FI_CONSTANT, empty); } -#define f_dummy_dynattr(_type, _f_type) ((struct f_dynamic_attr) { .type = _type, .f_type = _f_type, }) - -#define f_const_empty_path f_const_empty(f_dummy_dynattr(EAF_TYPE_AS_PATH, T_PATH)) -#define f_const_empty_clist f_const_empty(f_dummy_dynattr(EAF_TYPE_INT_SET, T_CLIST)) -#define f_const_empty_eclist f_const_empty(f_dummy_dynattr(EAF_TYPE_EC_SET, T_ECLIST)) -#define f_const_empty_lclist f_const_empty(f_dummy_dynattr(EAF_TYPE_LC_SET, T_LCLIST)) - /* * Remove all new lines and doubled whitespaces * and convert all tabulators to spaces @@ -884,7 +872,7 @@ method_term: ; method_cmd: - EMPTY { $$ = f_const_empty(FM.object->i_FI_EA_GET.da); } + EMPTY { $$ = f_const_empty(FM.object->i_FI_EA_GET.da.f_type); } | PREPEND '(' term ')' { $$ = f_new_inst(FI_PATH_PREPEND, FM.object, $3 ); } | ADD '(' term ')' { $$ = f_new_inst(FI_CLIST_ADD, FM.object, $3 ); } | DELETE '(' term ')' { $$ = f_new_inst(FI_CLIST_DEL, FM.object, $3 ); } @@ -925,10 +913,10 @@ term: $$ = $4; } - | '+' EMPTY '+' { $$ = f_const_empty_path; } - | '-' EMPTY '-' { $$ = f_const_empty_clist; } - | '-' '-' EMPTY '-' '-' { $$ = f_const_empty_eclist; } - | '-' '-' '-' EMPTY '-' '-' '-' { $$ = f_const_empty_lclist; } + | '+' EMPTY '+' { $$ = f_const_empty(T_PATH); } + | '-' EMPTY '-' { $$ = f_const_empty(T_CLIST); } + | '-' '-' EMPTY '-' '-' { $$ = f_const_empty(T_ECLIST); } + | '-' '-' '-' EMPTY '-' '-' '-' { $$ = f_const_empty(T_LCLIST); } | PREPEND '(' term ',' term ')' { $$ = f_new_inst(FI_PATH_PREPEND, $3, $5); } | ADD '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_ADD, $3, $5); } | DELETE '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_DEL, $3, $5); } |