From: Florian Weimer <fweimer@redhat.com>
To: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org>
Cc: Paul Eggert <eggert@cs.ucla.edu>,
bug-gnulib@gnu.org,
Adhemerval Zanella <adhemerval.zanella@linaro.org>
Subject: Re: [PATCH 2/2] posix: Remove alloca usage for internal fnmatch implementation
Date: Mon, 08 Mar 2021 13:59:42 +0100 [thread overview]
Message-ID: <87h7ller7l.fsf@oldenburg.str.redhat.com> (raw)
In-Reply-To: <20210104202528.1228255-2-adhemerval.zanella@linaro.org> (Adhemerval Zanella via Libc-alpha's message of "Mon, 4 Jan 2021 17:25:28 -0300")
* Adhemerval Zanella via Libc-alpha:
> - else if (*p == L_('|'))
> + else if (*p == L_(')') || *p == L_('|'))
> {
> if (level == 0)
> {
> - NEW_PATTERN;
> - startp = p + 1;
> + size_t slen = opt == L_('?') || opt == L_('@')
> + ? pattern_len : p - startp + 1;
> + CHAR *newp = malloc (slen * sizeof (CHAR));
> + if (newp != NULL)
> + {
> + *((CHAR *) MEMPCPY (newp, startp, p - startp)) = L_('\0');
> + PASTE (PATTERN_PREFIX,_add) (&list, newp);
> + }
> + if (newp == NULL || PASTE (PATTERN_PREFIX, _has_failed) (&list))
> + {
> + retval = -2;
> + goto out;
> + }
> +
> + if (*p == L_('|'))
> + startp = p + 1;
> }
slen seems to be the wrong variable name. But I don't know wh the
original code computes plen conditionally and then uses p - startp
unconditionally. That seems wrong. The discrepancy goes back to
821a6bb4360. Do you see a case where the difference matters?
The == 0 checks for the recursive FCT calls are wrong because they treat
match failure the same as OOM and other errors (the -2 return value),
but that also is a pre-existing issue.
The conversation itself appears to be faithful.
Thanks,
Florian
next prev parent reply other threads:[~2021-03-08 13:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-04 20:25 [PATCH 1/2] posix: User scratch_buffer on fnmatch Adhemerval Zanella
2021-01-04 20:25 ` [PATCH 2/2] posix: Remove alloca usage for internal fnmatch implementation Adhemerval Zanella
2021-03-08 12:59 ` Florian Weimer [this message]
2021-10-20 15:12 ` Adhemerval Zanella
2021-10-21 9:54 ` Florian Weimer
2021-01-04 20:35 ` [PATCH 1/2] posix: User scratch_buffer on fnmatch Florian Weimer
2021-01-05 13:07 ` Adhemerval Zanella
2021-01-13 19:25 ` Paul Eggert
2021-01-13 19:39 ` Florian Weimer
2021-01-13 23:36 ` Bruno Haible
2021-01-14 10:00 ` Florian Weimer
2021-03-06 17:18 ` Paul Eggert
2021-03-06 20:17 ` dealing with non-ASCII-safe encodings Bruno Haible
2021-01-14 11:44 ` [PATCH 1/2] posix: User scratch_buffer on fnmatch Adhemerval Zanella
2021-01-15 6:56 ` Paul Eggert
-- strict thread matches above, loose matches on Subject: below --
2021-02-02 13:08 [PATCH 1/2] posix: Falling back to non wide mode in case of encoding error [BZ #14185] Adhemerval Zanella
2021-02-02 13:08 ` [PATCH 2/2] posix: Remove alloca usage for internal fnmatch implementation Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h7ller7l.fsf@oldenburg.str.redhat.com \
--to=fweimer@redhat.com \
--cc=adhemerval.zanella@linaro.org \
--cc=bug-gnulib@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).