Module Name: src Committed By: matt Date: Mon Dec 14 20:45:02 UTC 2009
Modified Files: src/lib/libc/time: strptime.c Log Message: Back errant change due to botched merge. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/lib/libc/time/strptime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libc/time/strptime.c diff -u src/lib/libc/time/strptime.c:1.34 src/lib/libc/time/strptime.c:1.35 --- src/lib/libc/time/strptime.c:1.34 Mon Dec 14 05:51:56 2009 +++ src/lib/libc/time/strptime.c Mon Dec 14 20:45:02 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: strptime.c,v 1.34 2009/12/14 05:51:56 matt Exp $ */ +/* $NetBSD: strptime.c,v 1.35 2009/12/14 20:45:02 matt Exp $ */ /*- * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: strptime.c,v 1.34 2009/12/14 05:51:56 matt Exp $"); +__RCSID("$NetBSD: strptime.c,v 1.35 2009/12/14 20:45:02 matt Exp $"); #endif #include "namespace.h" @@ -267,7 +267,7 @@ sse *= 10; sse += *bp++ - '0'; rulim /= 10; - } while (((uint64_t)(sse * 10) <= TIME_MAX) && + } while ((sse * 10 <= TIME_MAX) && rulim && *bp >= '0' && *bp <= '9'); if (sse < 0 || (uint64_t)sse > TIME_MAX) {