Changeset 10638 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2008 10:01:32 AM (16 years ago)

Author:

vboxsync

Message:

Generalize the VbglR3WriteLog input checks and specialize the windows buffering.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp

@@ -55 +55 @@
 VBGLR3DECL(int) VbglR3WriteLog(const char *pch, size_t cb)
 {
-#if defined(RT_OS_WINDOWS) /** @todo more OSes could take this route (solaris and freebsd for instance). */
     /*
-     * Handle the entire request in one go.
+     * Quietly skip NULL strings.
+     * (Happens in the RTLogBackdoorPrintf case.)
      */
-    if (!pch || !cb)
+    if (!cb)
         return VINF_SUCCESS;
+    if (!VALID_PTR(pch))
+        return VERR_INVALID_POINTER;
 
+#ifdef RT_OS_WINDOWS
+    /*
+     * Duplicate the string as it may be read only (a C string).
+     */
     void *pvTmp = RTMemDup(pch, cb);
     if (!pvTmp)
@@ -68 +74 @@
     RTMemFree(pvTmp);
     return rc;
+
+#elif 0 /** @todo Several OSes could take this route (solaris and freebsd for instance). */
+    /*
+     * Handle the entire request in one go.
+     */
+    return vbglR3DoIOCtl(VBOXGUEST_IOCTL_LOG(cb), pvTmp, cb);
 
 #else