From 757d623b2f4ef9184a2db87e7e4bba1634aa0c93 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Wed, 10 May 2006 22:15:36 +0000 Subject: [PATCH] Fixed strncpyWithEOS --- motorApp/NewportSrc/asynOctetSocket.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/motorApp/NewportSrc/asynOctetSocket.cpp b/motorApp/NewportSrc/asynOctetSocket.cpp index b97d0f12..1746a50e 100644 --- a/motorApp/NewportSrc/asynOctetSocket.cpp +++ b/motorApp/NewportSrc/asynOctetSocket.cpp @@ -257,9 +257,11 @@ void strncpyWithEOS(char * szStringOut, const char * szStringIn, int nNumberOfCh { char *eos = "\n"; +/* if ((nNumberOfCharToCopy + (int)strlen(eos)) > nStringOutSize) { return; } - strcpy(szStringOut, szStringIn); - strcat(szStringOut, eos); +*/ + strncpy(szStringOut, szStringIn, nStringOutSize); + /* strcat(szStringOut, eos); */ }