* posix/fnmatch_loop.c (internal_fnmatch): Clear is_seqval after

	normal_bracket label.

	* time/tst-mktime2.c (bigtime_test): Initialize tm.tm_isdst to -1.

diff --git a/ChangeLog b/ChangeLog
index c46fcc0..f043421 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
        * stdlib/stdlib.h (realpath): Remove nonnull attribute.
 
+       * posix/fnmatch_loop.c (internal_fnmatch): Clear is_seqval after
+       normal_bracket label.
+
+       * time/tst-mktime2.c (bigtime_test): Initialize tm.tm_isdst to -1.
+
 2004-12-01  Roland McGrath  <roland@redhat.com>
 
        * sysdeps/gnu/Makefile ($(objpfx)errlist-compat.c):

diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
index fb56bd4..449e5e0 100644 (file)
--- a/posix/fnmatch_loop.c
+++ b/posix/fnmatch_loop.c
@@ -600,6 +600,9 @@ FCT (pattern, string, string_end, no_leading_period, flags)
                        if (!is_range && c == fn)
                          goto matched;
 
+                       /* This is needed if we goto normal_bracket; from
+                          outside of is_seqval's scope.  */
+                       is_seqval = 0;
                        cold = c;
                        c = *p++;
                      }

diff --git a/time/tst-mktime2.c b/time/tst-mktime2.c
index fe7c370..6279218 100644 (file)
--- a/time/tst-mktime2.c
+++ b/time/tst-mktime2.c
@@ -78,6 +78,7 @@ bigtime_test (int j)
   struct tm tm;
   time_t now;
   tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j;
+  tm.tm_isdst = -1;
   now = mktime (&tm);
   if (now != (time_t) -1)
     {