From patchwork Tue Jan 18 16:33:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 50174 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F6BA3857805 for ; Tue, 18 Jan 2022 16:36:58 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [IPv6:2001:a60:0:28:0:1:25:1]) by sourceware.org (Postfix) with ESMTPS id 8AF61385802F for ; Tue, 18 Jan 2022 16:33:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8AF61385802F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux-m68k.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nefkom.net Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4JdZ7y5fnSz1sFF7 for ; Tue, 18 Jan 2022 17:33:02 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4JdZ7y5XTTz1qqkG for ; Tue, 18 Jan 2022 17:33:02 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ogNITIEsE8IM for ; Tue, 18 Jan 2022 17:33:01 +0100 (CET) X-Auth-Info: Ssb8TvrUw1JusM6DqGJn/OW/BnBZ74tc4TQN4cBYuCOek5JZwda+cWzY+JuUm4r5 Received: from igel.home (ppp-46-244-174-214.dynamic.mnet-online.de [46.244.174.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Tue, 18 Jan 2022 17:33:01 +0100 (CET) Received: by igel.home (Postfix, from userid 1000) id 5E1562C39F5; Tue, 18 Jan 2022 17:33:00 +0100 (CET) From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Fix handling of unterminated bracket expressions in fnmatch (bug 28792) X-Yow: Has everybody got HALVAH spread all over their ANKLES??... Now, it's time to ``HAVE A NAGEELA''!! Date: Tue, 18 Jan 2022 17:33:00 +0100 Message-ID: <874k616m2r.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.91 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" When fnmatch processes a bracket expression, and finds it to be unterminated, it should rescan it, treating the starting bracket as a normal character. That didn't happen when a matching character was found while scanning the bracket expression. --- posix/Makefile | 2 +- posix/fnmatch_loop.c | 9 +++++++-- posix/tst-fnmatch7.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 posix/tst-fnmatch7.c diff --git a/posix/Makefile b/posix/Makefile index 24d8bfd303..831759c59f 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -101,7 +101,7 @@ tests := test-errno tstgetopt testfnm runtests runptests \ bug-getopt5 tst-getopt_long1 bug-regex34 bug-regex35 \ tst-pathconf tst-rxspencer-no-utf8 \ tst-fnmatch3 bug-regex36 \ - tst-fnmatch4 tst-fnmatch5 tst-fnmatch6 \ + tst-fnmatch4 tst-fnmatch5 tst-fnmatch6 tst-fnmatch7 \ tst-posix_spawn-fd tst-posix_spawn-setsid \ tst-posix_fadvise tst-posix_fadvise64 \ tst-sysconf-empty-chroot tst-glob_symlinks tst-fexecve \ diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c index cab4e1b684..9445ed9c58 100644 --- a/posix/fnmatch_loop.c +++ b/posix/fnmatch_loop.c @@ -823,8 +823,13 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, while ((c = *p++) != L_(']')) { if (c == L_('\0')) - /* [... (unterminated) loses. */ - return FNM_NOMATCH; + { + /* [ unterminated, treat as normal character. */ + p = p_init; + n = n_init; + c = L_('['); + goto normal_match; + } if (!(flags & FNM_NOESCAPE) && c == L_('\\')) { diff --git a/posix/tst-fnmatch7.c b/posix/tst-fnmatch7.c new file mode 100644 index 0000000000..eda1bf9704 --- /dev/null +++ b/posix/tst-fnmatch7.c @@ -0,0 +1,37 @@ +/* Test for fnmatch handling of unterminated bracket expression (bug 28792) + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +static int +do_test (void) +{ + /* An unterminated bracket expression should be rescanned, treating the + open bracket as a normal character. The backslash causes the close + bracket to be treated as a normal character, not ending the bracket + expression. */ + TEST_VERIFY (fnmatch ("[", "[", 0) == 0); + TEST_VERIFY (fnmatch ("[[", "[[", 0) == 0); + TEST_VERIFY (fnmatch ("[\\]", "[]", 0) == 0); + TEST_VERIFY (fnmatch ("[[\\]", "[[]", 0) == 0); + + return 0; +} + +#include