From: Dave Hart <hart@ntp.org>
Date: Wed, 13 Apr 2011 02:22:24 +0000 (+0000)
Subject: ntp_proto.c sprintf() -> snprintf()
X-Git-Tag: NTP_4_2_7P150~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24ca26a699fa3423835024cabeae366071badbe7;p=thirdparty%2Fntp.git

ntp_proto.c sprintf() -> snprintf()

bk: 4da508e0vtHRNUBDB-lkZJ9S6Ff5Yg
---

diff --git a/ChangeLog b/ChangeLog
index 4187237d7..7391c6bc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
   replacements (http://www.jhweiss.de/software/snprintf.html)
 * Remove remaining sprintf() calls except refclock_ripencc.c (which is
   kept out of --enable-all-clocks as a result), upstream libs which use
-  sprintf() ony after careful buffer sizing, and ntp_proto.c.
+  sprintf() only after careful buffer sizing.
 (4.2.7p149) 2011/04/11 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1881] describe the {+,-,s} characters in configure --help output.
 (4.2.7p148) 2011/04/09 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 77e1ef433..978d0e467 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1573,7 +1573,8 @@ process_packet(
 		p_del = t21 - t34;
 		p_offset = (t21 + t34) / 2.;
 		if (p_del < 0 || p_del > 1.) {
-			sprintf(statstr, "t21 %.6f t34 %.6f", t21, t34);
+			snprintf(statstr, sizeof(statstr),
+			    "t21 %.6f t34 %.6f", t21, t34);
 			report_event(PEVNT_XERR, peer, statstr);
 			return;
 		}
@@ -1597,7 +1598,7 @@ process_packet(
 			peer->aorg = p_xmt;
 			peer->borg = peer->dst;
 			if (t34 < 0 || t34 > 1.) {
-				sprintf(statstr,
+				snprintf(statstr, sizeof(statstr),
 				    "offset %.6f delay %.6f", t21, t34);
 				report_event(PEVNT_XERR, peer, statstr);
 				return;