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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 B718DC76188 for ; Sun, 21 Jul 2019 10:22:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8ABAF2085A for ; Sun, 21 Jul 2019 10:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726047AbfGUKWd (ORCPT ); Sun, 21 Jul 2019 06:22:33 -0400 Received: from Chamillionaire.breakpoint.cc ([193.142.43.52]:49262 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726020AbfGUKWc (ORCPT ); Sun, 21 Jul 2019 06:22:32 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.89) (envelope-from ) id 1hp8z9-0004aj-9y; Sun, 21 Jul 2019 12:22:31 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nft] scanner: don't rely on fseek for input stream repositioning Date: Sun, 21 Jul 2019 12:18:31 +0200 Message-Id: <20190721101831.28089-1-fw@strlen.de> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org It doesn't work when reading from a pipe, leading to parser errors in case of 'cat foo | nft -f -', whereas 'nft -f < foo' works fine. Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1354 Signed-off-by: Florian Westphal --- src/scanner.l | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/scanner.l b/src/scanner.l index 4ed5f9241381..c1adcbddbd73 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -36,23 +36,28 @@ */ #define YY_INPUT(buf,result,max_size) \ { \ - long n = 0; \ + result = 0; \ errno = 0; \ - while ((result = fread(buf, 1, max_size, yyin)) == 0 && \ - ferror(yyin)) { \ - if (errno != EINTR) { \ - YY_FATAL_ERROR("input in flex scanner failed"); \ - break; \ + \ + while (result < max_size) { \ + int chr = fgetc(yyin); \ + \ + if (chr != EOF) { \ + buf[result++] = chr; \ + if (chr == '\n' || chr == ' ') \ + break; \ + continue; \ } \ - errno = 0; \ - clearerr(yyin); \ - } \ - if (result > 1 && !feof(yyin)) { \ - while (result > 1 && \ - (buf[result - 1] != '\n' && buf[result - 1] != ' ')) \ - result--, n++; \ - result--, n++; \ - fseek(yyin, -n, SEEK_CUR); \ + \ + if (ferror(yyin)) { \ + if (errno != EINTR) { \ + YY_FATAL_ERROR("input in flex scanner failed"); \ + break; \ + } \ + errno = 0; \ + clearerr(yyin); \ + } \ + break; \ } \ } -- 2.21.0