diff options
| author | Xin LI <delphij@FreeBSD.org> | 2016-12-22 16:19:05 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2016-12-22 16:19:05 +0000 |
| commit | 2a3488342441b3296995c8a9eca705a468d0eff0 (patch) | |
| tree | 0ddd6422cb1fb658884e045a0527f7a24e4df58e /contrib/ntp/ntpd/refclock_jjy.c | |
| parent | 59570923bc07f0e74f90b47bd0e10dc5db508d4a (diff) | |
Fix multiple vulnerabilities of ntp.releng/10.2
Approved by: so
Notes
Notes:
svn path=/releng/10.2/; revision=310419
Diffstat (limited to 'contrib/ntp/ntpd/refclock_jjy.c')
| -rw-r--r-- | contrib/ntp/ntpd/refclock_jjy.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/ntp/ntpd/refclock_jjy.c b/contrib/ntp/ntpd/refclock_jjy.c index fc51fd9ee4b5..f53150fc5ae2 100644 --- a/contrib/ntp/ntpd/refclock_jjy.c +++ b/contrib/ntp/ntpd/refclock_jjy.c @@ -106,6 +106,10 @@ /* 2015/05/15 */ /* [Add] Support the SEIKO TIME SYSTEMS TDC-300 */ /* */ +/* 2016/05/08 */ +/* [Fix] C-DEX JST2000 */ +/* Thanks to Mr. Kuramatsu for the report and the patch. */ +/* */ /**********************************************************************/ #ifdef HAVE_CONFIG_H @@ -1499,9 +1503,9 @@ jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp ) return JJY_RECEIVE_ERROR ; } - /* JYYMMDD HHMMSSS */ + /* JYYMMDDWHHMMSSS */ - rc = sscanf ( pBuf, "J%2d%2d%2d %2d%2d%2d%1d", + rc = sscanf ( pBuf, "J%2d%2d%2d%*1d%2d%2d%2d%1d", &up->year, &up->month, &up->day, &up->hour, &up->minute, &up->second, &up->msecond ) ; |