Changeset 63122 in vbox for trunk/src/VBox

Timestamp:

Aug 7, 2016 3:25:21 AM (8 years ago)

Author:

vboxsync

Message:

vboxClipboardDump,DumpHtml: Warnings (always check that the for loop counter and limit are somewhat compative). RTStrCopy will always terminate the result, so give it the full size so it won't truncate a string that's missing the terminator.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp

@@ -99 +99 @@
 
             //size_t cb = RTStrNLen(pv, );
-            char *buf = (char *)RTMemAlloc(cb + 1);
-            RT_BZERO(buf, cb);
-            RTStrCopy(buf, cb, (const char*)pv);
+            char *pszBuf = (char *)RTMemAllocZ(cb + 1);
+            RTStrCopy(pszBuf, cb + 1, (const char *)pv);
             for (size_t off = 0; off < cb; ++off)
             {
-                if (buf[off] == '\n' || buf[off] == '\r')
-                    buf[off] = ' ';
-            }
-
-            Log(("%s\n", buf));
-            RTMemFree(buf);
+                if (pszBuf[off] == '\n' || pszBuf[off] == '\r')
+                    pszBuf[off] = ' ';
+            }
+
+            Log(("%s\n", pszBuf));
+            RTMemFree(pszBuf);
         }
         else
@@ -834 +833 @@
 }
 
-int DumpHtml(char* src, size_t cb)
-{
-    size_t lenght = 0;
-    int rc = RTStrNLenEx(src, cb, &lenght);
+int DumpHtml(const char *pszSrc, size_t cb)
+{
+    size_t cchIgnored = 0;
+    int rc = RTStrNLenEx(pszSrc, cb, &cchIgnored);
     if (RT_SUCCESS(rc))
     {
-        char* buf = (char*)RTMemAlloc(cb + 1);
-        if (buf != NULL)
-        {
-            RT_BZERO(buf, cb + 1);
-            rc = RTStrCopy(buf, cb, (const char*)src);
+        char *pszBuf = (char *)RTMemAllocZ(cb + 1);
+        if (pszBuf != NULL)
+        {
+            rc = RTStrCopy(pszBuf, cb + 1, (const char *)pszSrc);
             if (RT_SUCCESS(rc))
             {
                 for (size_t i = 0; i < cb; ++i)
-                    if (buf[i] == '\n' || buf[i] == '\r')
-                        buf[i] = ' ';
+                    if (pszBuf[i] == '\n' || pszBuf[i] == '\r')
+                        pszBuf[i] = ' ';
             }
             else
                 Log(("Error in copying string.\n"));
-            Log(("Removed \\r\\n: %s\n", buf));
-            RTMemFree(buf);
+            Log(("Removed \\r\\n: %s\n", pszBuf));
+            RTMemFree(pszBuf);
         }
         else