Changeset 61578 in vbox for trunk/src/VBox

Timestamp:

Jun 8, 2016 2:09:27 PM (9 years ago)

Author:

vboxsync

Message:

Debugger/Digger/Linux: Fix for buffer overflow return code

File:

• trunk/src/VBox/Debugger/DBGPlugInLinux.cpp (modified) (2 diffs)

trunk/src/VBox/Debugger/DBGPlugInLinux.cpp

@@ -420 +420 @@
 
     /** @todo: Try to parse where the single messages start to make use of cMessages. */
-    memcpy(&pszBuf[0], pbLogBuf, RT_MIN(cbBuf, cbLogBuf));
+    size_t cchLength = RTStrNLen((const char *)pbLogBuf, cbLogBuf);
+    memcpy(&pszBuf[0], pbLogBuf, RT_MIN(cbBuf, cchLength));
 
     /* Done with the buffer. */
@@ -427 +428 @@
     /* Set return size value. */
     if (pcbActual)
-        *pcbActual = RT_MIN(cbBuf, cbLogBuf);
-
-    return cbBuf <= cbLogBuf ? VINF_SUCCESS : VERR_BUFFER_OVERFLOW;
+        *pcbActual = RT_MIN(cbBuf, cchLength);
+
+    return cbBuf <= cchLength ? VERR_BUFFER_OVERFLOW : VINF_SUCCESS;
 }