From f9a7302fd1f88e311dd89e1c9d8b4ad572af6cfa Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 11 Feb 2000 21:04:20 +0000 Subject: Update. 2000-02-09 Andreas Jaeger * time/strptime.c (strptime_internal): Fix pointer dereference. Patch by Juergen Heinzl , closes PR libc/1591. --- ChangeLog | 6 ++++++ time/strptime.c | 4 ++-- 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 + + * time/strptime.c (strptime_internal): Fix pointer dereference. + Patch by Juergen Heinzl , closes PR + libc/1591. + 2000-02-08 Jakub Jelinek * 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 , 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; -- cgit 1.4.1