From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 718C2C63797 for ; Thu, 22 Jul 2021 16:53:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AF496052B for ; Thu, 22 Jul 2021 16:53:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235049AbhGVQMm (ORCPT ); Thu, 22 Jul 2021 12:12:42 -0400 Received: from mail.netfilter.org ([217.70.188.207]:55420 "EHLO mail.netfilter.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235581AbhGVQLj (ORCPT ); Thu, 22 Jul 2021 12:11:39 -0400 Received: from localhost.localdomain (unknown [78.30.10.20]) by mail.netfilter.org (Postfix) with ESMTPSA id 6497F642A0 for ; Thu, 22 Jul 2021 18:51:47 +0200 (CEST) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft 2/2] parser_json: inconditionally initialize ct timeout list Date: Thu, 22 Jul 2021 18:52:14 +0200 Message-Id: <20210722165214.1982-2-pablo@netfilter.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210722165214.1982-1-pablo@netfilter.org> References: <20210722165214.1982-1-pablo@netfilter.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The policy is optional, make sure this timeout list is initialized. Signed-off-by: Pablo Neira Ayuso --- src/parser_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parser_json.c b/src/parser_json.c index e03b51697cb7..666aa2fcc9ec 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -3204,7 +3204,6 @@ static int json_parse_ct_timeout_policy(struct json_ctx *ctx, return 1; } - init_list_head(&obj->ct_timeout.timeout_list); json_object_foreach(tmp, key, val) { struct timeout_state *ts; @@ -3351,6 +3350,7 @@ static struct cmd *json_parse_cmd_add_object(struct json_ctx *ctx, } obj->ct_helper.l3proto = l3proto; + init_list_head(&obj->ct_timeout.timeout_list); if (json_parse_ct_timeout_policy(ctx, root, obj)) { obj_free(obj); return NULL; -- 2.20.1