From a18f78208ab5ecfbb54bce4b1815862004955f22 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 9 Jun 2008 18:30:03 +0000
Subject: [PATCH] do not copy up to two garbage characters from a 1 char string
 into a 4 char output buffer; ok henning

---
 src/usr.sbin/ntpd/sensors.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/usr.sbin/ntpd/sensors.c b/src/usr.sbin/ntpd/sensors.c
index 8bbae220..c7d4f94b 100644
--- a/src/usr.sbin/ntpd/sensors.c
+++ b/src/usr.sbin/ntpd/sensors.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sensors.c,v 1.37 2008/06/09 16:52:04 deraadt Exp $ */
+/*	$OpenBSD: sensors.c,v 1.38 2008/06/09 18:30:03 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Henning Brauer <henning@openbsd.org>
@@ -129,8 +129,10 @@ sensor_add(int sensordev, char *dxname)
 
 	if (cs->refstr == NULL)
 		memcpy(&s->refstr, "HARD", sizeof(s->refstr));
-	else
-		memcpy(&s->refstr, cs->refstr, sizeof(s->refstr));
+	else {
+		s->refstr = 0;
+		strncpy((char *)&s->refstr, cs->refstr, sizeof(s->refstr));
+	}
 
 	TAILQ_INSERT_TAIL(&conf->ntp_sensors, s, entry);