X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.c;h=34464ee638c1e04c028a337469cd32b125c3f335;hp=f01ba731664018d442a5b8d6660210bb03487298;hb=fe3ecee341da8542aa25b962dcb8bcc628fcdd1e;hpb=5df8137ebc5db2bc9c6e71b2d154a5f77679d9d8 diff --git a/utils.c b/utils.c index f01ba73..34464ee 100644 --- a/utils.c +++ b/utils.c @@ -488,10 +488,20 @@ void fw3_free_object(void *obj, const void *opts) { const struct fw3_option *ol; + struct list_head *list, *cur, *tmp; for (ol = opts; ol->name; ol++) - if (ol->elem_size) - fw3_free_list((struct list_head *)((char *)obj + ol->offset)); + { + if (!ol->elem_size) + continue; + + list = (struct list_head *)((char *)obj + ol->offset); + list_for_each_safe(cur, tmp, list) + { + list_del(cur); + free(cur); + } + } free(obj); }