Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous - casting to long is a bad idea, as the value will overflow. 

Pointed out by apb.
This commit is contained in:
martin 2012-10-25 15:04:05 +00:00
parent f5962309a9
commit a5430d17c3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/time/zic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zic.c,v 1.33 2012/10/25 13:14:32 martin Exp $ */
/* $NetBSD: zic.c,v 1.34 2012/10/25 15:04:05 martin Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2006-07-17 by Arthur David Olson.
@ -10,7 +10,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: zic.c,v 1.33 2012/10/25 13:14:32 martin Exp $");
__RCSID("$NetBSD: zic.c,v 1.34 2012/10/25 15:04:05 martin Exp $");
#endif /* !defined lint */
#include "version.h"
@ -1128,11 +1128,11 @@ inleap(char **const fields, const int nfields)
error(_("time before zero"));
return;
}
if (dayoff < (long)(min_time / SECSPERDAY)) {
if (dayoff < min_time / SECSPERDAY) {
error(_("time too small"));
return;
}
if (dayoff > (long)(max_time / SECSPERDAY)) {
if (dayoff > max_time / SECSPERDAY) {
error(_("time too large"));
return;
}
@ -2522,9 +2522,9 @@ rpytime(const struct rule *const rp, const int wantedy)
will not work with pre-2004 versions of zic"));
}
}
if (dayoff < (long)(min_time / SECSPERDAY))
if (dayoff < min_time / SECSPERDAY)
return min_time;
if (dayoff > (long)(max_time / SECSPERDAY))
if (dayoff > max_time / SECSPERDAY)
return max_time;
t = (zic_t) dayoff * SECSPERDAY;
return tadd(t, rp->r_tod);