Changeset 087a3c9 in nscp for trunk/include/NSCHelper.cpp

Timestamp:

02/19/08 19:10:56 (5 years ago)

Author:

Michael Medin <michael@…>

Children:

6922706

Parents:

34f5502

Message:

+ Fixed a buffer overflow in the NRPE socket handling.

File:

• trunk/include/NSCHelper.cpp (modified) (3 diffs)

trunk/include/NSCHelper.cpp

@@ -24 +24 @@
 #include <msvc_wrappers.h>
 #include <config.h>
+#include <strEx.h>
 
 #ifdef DEBUG
@@ -69 +70 @@
 int NSCHelper::wrapReturnString(TCHAR *buffer, unsigned int bufLen, std::wstring str, int defaultReturnCode ) {
   // @todo deprecate this
-  if (str.length() >= bufLen)
+  if (str.length() >= bufLen) {
+    std::wstring sstr = str.substr(0, min(10, str.length()));
+    NSC_DEBUG_MSG_STD(_T("String (") + strEx::itos(str.length()) + _T(") to long to fit inside buffer(") + strEx::itos(bufLen) + _T(") : ") + sstr);
     return NSCAPI::isInvalidBufferLen;
+  }
   wcsncpy_s(buffer, bufLen, str.c_str(), bufLen);
   return defaultReturnCode;
@@ -110 +114 @@
   else if (returnCode == NSCAPI::returnWARN)
     return _T("WARNING");
+  else if (returnCode == NSCAPI::returnUNKNOWN)
+    return _T("WARNING");
   else
-    return _T("UNKNOWN");
+    return _T("BAD_CODE");
 }