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

Coverity CID 3497: Don't try to set the day/month if we did not get them

Browse Source 
from the clock.
This commit is contained in:
christos 2006-05-13 23:55:23 +00:00
parent e9c9374d31
commit 386c6259af
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dist/ntp/ntpd/refclock_heath.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: refclock_heath.c,v 1.2 2003/12/04 16:23:37 drochner Exp $ */ /* $NetBSD: refclock_heath.c,v 1.3 2006/05/13 23:55:23 christos Exp $ */
/* /*
* refclock_heath - clock driver for Heath GC-1000 and and GC-1000 II * refclock_heath - clock driver for Heath GC-1000 and and GC-1000 II
@ -298,6 +298,39 @@ heath_receive(
refclock_report(peer, CEVNT_BADREPLY); refclock_report(peer, CEVNT_BADREPLY);
return; return;
} }
/*
* We determine the day of the year from the DIPswitches. This
* should be fixed, since somebody might forget to set them.
* Someday this hazard will be fixed by a fiendish scheme that
* looks at the timecode and year the radio shows, then computes
* the residue of the seconds mod the seconds in a leap cycle.
* If in the third year of that cycle and the third and later
* months of that year, add one to the day. Then, correct the
* timecode accordingly. Icky pooh. This bit of nonsense could
* be avoided if the engineers had been required to write a
* device driver before finalizing the timecode format.
*/
if (month < 1 || month > 12 || day < 1) {
refclock_report(peer, CEVNT_BADTIME);
return;
}
if (pp->year % 4) {
if (day > day1tab[month - 1]) {
refclock_report(peer, CEVNT_BADTIME);
return;
}
for (i = 0; i < month - 1; i++)
day += day1tab[i];
} else {
if (day > day2tab[month - 1]) {
refclock_report(peer, CEVNT_BADTIME);
return;
}
for (i = 0; i < month - 1; i++)
day += day2tab[i];
}
pp->day = day;
break; break;
/* /*
@ -316,38 +349,6 @@ heath_receive(
return; return;
} }
/*
* We determine the day of the year from the DIPswitches. This
* should be fixed, since somebody might forget to set them.
* Someday this hazard will be fixed by a fiendish scheme that
* looks at the timecode and year the radio shows, then computes
* the residue of the seconds mod the seconds in a leap cycle.
* If in the third year of that cycle and the third and later
* months of that year, add one to the day. Then, correct the
* timecode accordingly. Icky pooh. This bit of nonsense could
* be avoided if the engineers had been required to write a
* device driver before finalizing the timecode format.
*/
if (month < 1 || month > 12 || day < 1) {
refclock_report(peer, CEVNT_BADTIME);
return;
}
if (pp->year % 4) {
if (day > day1tab[month - 1]) {
refclock_report(peer, CEVNT_BADTIME);
return;
}
for (i = 0; i < month - 1; i++)
day += day1tab[i];
} else {
if (day > day2tab[month - 1]) {
refclock_report(peer, CEVNT_BADTIME);
return;
}
for (i = 0; i < month - 1; i++)
day += day2tab[i];
}
pp->day = day;
/* /*
* Determine synchronization and last update * Determine synchronization and last update