Changeset 42077 in vbox for trunk/src

Timestamp:

Jul 10, 2012 8:37:08 AM (13 years ago)

Author:

vboxsync

Message:

Runtime/Process: Missing changes, relax the parameter checks for RTProcQueryUsername

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/process-posix.cpp (modified) (2 diffs)
• win/process-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/posix/process-posix.cpp

@@ -151 +151 @@
                                   size_t *pcbUser)
 {
-    AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
-    AssertReturn(cbUser > 0, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcbUser, VERR_INVALID_POINTER);
+    AssertReturn(   (pszUser && cbUser > 0)
+                 || (!pszUser && !cbUser), VERR_INVALID_PARAMETER);
 
     if (hProcess != RTProcSelf())
@@ -172 +171 @@
         size_t cbPwdUser = strlen(pPwd->pw_name) + 1;
 
-        *pcbUser = cbPwdUser;
+        if (pcbUser)
+            *pcbUser = cbPwdUser;
 
         if (cbPwdUser > cbUser)

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -1429 +1429 @@
                                   size_t *pcbUser)
 {
-    AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
-    AssertReturn(cbUser > 0, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcbUser, VERR_INVALID_POINTER);
+    AssertReturn(   (pszUser && cbUser > 0)
+                 || (!pszUser && !cbUser), VERR_INVALID_PARAMETER);
 
     if (hProcess != RTProcSelf())
@@ -1448 +1447 @@
         size_t cbUserName = strlen(pszUserName) + 1;
 
-        *pcbUser = cbUserName;
+        if (pcbUser)
+            *pcbUser = cbUserName;
 
         if (cbUserName > cbUser)