aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-02-11 21:04:20 +0000
committerUlrich Drepper <drepper@redhat.com>2000-02-11 21:04:20 +0000
commitf9a7302fd1f88e311dd89e1c9d8b4ad572af6cfa (patch)
tree9929763596ace8e4cda21df0b519ec8133f3041a
parentd6c5fe3a25c83d24db725fb62cba974f271e792f (diff)
downloadglibc-f9a7302fd1f88e311dd89e1c9d8b4ad572af6cfa.tar
glibc-f9a7302fd1f88e311dd89e1c9d8b4ad572af6cfa.tar.gz
glibc-f9a7302fd1f88e311dd89e1c9d8b4ad572af6cfa.tar.bz2
glibc-f9a7302fd1f88e311dd89e1c9d8b4ad572af6cfa.zip
Update.
2000-02-09 Andreas Jaeger <aj@suse.de> * time/strptime.c (strptime_internal): Fix pointer dereference. Patch by Juergen Heinzl <juergen@monocerus.demon.co.uk>, closes PR libc/1591.
-rw-r--r--ChangeLog6
-rw-r--r--time/strptime.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 25ab9d65ec..fee8cdec42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-09 Andreas Jaeger <aj@suse.de>
+
+ * time/strptime.c (strptime_internal): Fix pointer dereference.
+ Patch by Juergen Heinzl <juergen@monocerus.demon.co.uk>, closes PR
+ libc/1591.
+
2000-02-08 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/msgctl.c: New file.
diff --git a/time/strptime.c b/time/strptime.c
index 970b1c957e..e9c10ab760 100644
--- a/time/strptime.c
+++ b/time/strptime.c
@@ -1,5 +1,5 @@
/* Convert a string representation of time to a time value.
- Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -459,7 +459,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
}
else
{
- if (decided == not
+ if (*decided == not
&& strcmp (_NL_CURRENT (LC_TIME, D_FMT), HERE_D_FMT))
*decided = loc;
want_xday = 1;