From 0dc1c8b72de80de45b9f8b2cef77778a1bb327e4 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 28 Apr 2011 07:58:26 +0000
Subject: [PATCH] bug 1362: strcpy -> strncpy
---
MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
index f3f2f29245d..75693b00c20 100644
--- a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
@@ -375,14 +375,14 @@ void TbbSettings::setDestination(int32 channelnr, char *storage)
ifstream fin("/opt/lofar/etc/StaticMetaData/Storage+MAC.dat", ifstream::in );
while (!fin.eof()) {
- fin.getline(line,100);
+ fin.getline(line,sizeof line);
if (strlen(line) < 6 || line[0] == '#') { continue; }
key = strtok (line," ");
if (strcmp(storage, key) == 0) {
val = strtok(NULL, " ");
- strcpy(mac,val);
+ strncpy(mac,sizeof mac,val);
val = strtok(NULL, " ");
- strcpy(ip,val);
+ strncpy(ip,sizeof ip,val);
LOG_DEBUG_STR(formatString("storage=%s mac=%s ip=%s", key, mac, ip));
break;
}
--
GitLab