regex.c change between 1.64 and 1.65

regex.c change between 1.64 and 1.65

[Andreas Schwab]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 746 bytes --]

What is this change in posix/regex.c supposed to fix?

@@ -2910,7 +2910,7 @@
 
                 if (p == pend)
                   {
-                    if (syntax & RE_NO_BK_BRACES)
+                    if (!(syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
                       goto unfetch_interval;
                     else
                       FREE_STACK_RETURN (REG_EBRACE);


When the label handle_interval is reached the RE_INTERVALS bit is always
set, so this condition cannot ever be true any more.

Andreas.

-- 
Andreas Schwab                                  "And now for something
SuSE Labs                                        completely different."
schwab@suse.de
SuSE GmbH, Schanzäckerstr. 10, D-90443 Nürnberg

Re: regex.c change between 1.64 and 1.65

[Ulrich Drepper]

Andreas Schwab <schwab@suse.de> writes:

> What is this change in posix/regex.c supposed to fix?

As you can read in the ChangeLog, it's supposed to fix error value
settings.  I haven't investigated all places I changed in detail but
the changes should all be correct.  In this case it would mean that
the `if' isn't necessary.

-- 
---------------.      drepper at gnu.org  ,-.   1325 Chesapeake Terrace
Ulrich Drepper  \    ,-------------------'   \  Sunnyvale, CA 94089 USA
Red Hat          `--' drepper at redhat.com   `------------------------

Re: regex.c change between 1.64 and 1.65

[Andreas Schwab]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 938 bytes --]

Ulrich Drepper <drepper@redhat.com> writes:

|> Andreas Schwab <schwab@suse.de> writes:
|> 
|> > What is this change in posix/regex.c supposed to fix?
|> 
|> As you can read in the ChangeLog, it's supposed to fix error value
|> settings.  I haven't investigated all places I changed in detail but
|> the changes should all be correct.

SUS2 says that malformed brace groups are undefined behaviour.  Previously
the regexp compiler took the brace as a literal instead, now it will
reject the regexp.  I'd prefer to restore the previous behaviour, since it
is compatible with other regexp matchers.

|> In this case it would mean that the `if' isn't necessary.

IMHO this is not the right way to fix the problem.

Andreas.

-- 
Andreas Schwab                                  "And now for something
SuSE Labs                                        completely different."
schwab@suse.de
SuSE GmbH, Schanzäckerstr. 10, D-90443 Nürnberg