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=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 E1C4CC352A3 for ; Mon, 10 Feb 2020 10:17:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B08C720733 for ; Mon, 10 Feb 2020 10:17:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=protonmail.ch header.i=@protonmail.ch header.b="YKIkZYbU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727536AbgBJKRb (ORCPT ); Mon, 10 Feb 2020 05:17:31 -0500 Received: from mail1.protonmail.ch ([185.70.40.18]:24318 "EHLO mail1.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727499AbgBJKRb (ORCPT ); Mon, 10 Feb 2020 05:17:31 -0500 Date: Mon, 10 Feb 2020 10:17:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.ch; s=default; t=1581329849; bh=qfhK4LAW9V0baU6xmRTfewAC3vtFsivWJm6lPf19pjg=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References: Feedback-ID:From; b=YKIkZYbUoV0IMs+ZTh+mZqmJs/q5V11gD+fNmAssBejDAuWl+P5o8iMiLzmwedrer tg9vKqU5iBuKQQZ3cGfad4y44yDUg+OFzj0D7a+8w3D4n8CTvsXJEAdcg/zE2I8cCM QHkZNVahzdE9Rxn0LHB/jiMn63CwjyRf6pQ7Ro+8= To: netfilter-devel@vger.kernel.org From: Laurent Fasnacht Cc: Laurent Fasnacht Reply-To: Laurent Fasnacht Subject: [PATCH nft include v2 6/7] scanner: fix indesc_list stack to be in the correct order Message-ID: <20200210101709.9182-7-fasnacht@protonmail.ch> In-Reply-To: <20200210101709.9182-1-fasnacht@protonmail.ch> References: <20200210101709.9182-1-fasnacht@protonmail.ch> Feedback-ID: 67Kw-YMwrBchoIMLcnFuA64ZnJub6AgnNvfJUjsgbTTSp4dmymKgGy_PLLqmOsJ9F58iClONCeGYaqp9YPx84w==:Ext:ProtonMail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This fixes the location displayed in error messages. Signed-off-by: Laurent Fasnacht --- src/scanner.l | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/scanner.l b/src/scanner.l index 7f40c5c1..8407a2a1 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -668,7 +668,11 @@ addrstring=09({macaddr}|{ip4addr}|{ip6addr}) static void scanner_push_indesc(struct parser_state *state, =09=09=09=09struct input_descriptor *indesc) { -=09list_add_tail(&indesc->list, &state->indesc_list); +=09if (!state->indesc) { +=09=09list_add_tail(&indesc->list, &state->indesc_list); +=09} else { +=09=09list_add(&indesc->list, &state->indesc->list); +=09} =09state->indesc =3D indesc; =09state->indesc_idx++; } --=20 2.20.1