Changeset 39462 in vbox

Timestamp:

Nov 29, 2011 5:49:01 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75110

Message:

VBoxService/GuestCtrl: Only close stdin when we really wrote all data of last block.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp

@@ -322 +322 @@
 static int VBoxServiceControlThreadCloseStdIn(RTPOLLSET hPollSet, PRTPIPE phStdInW)
 {
+    AssertPtrReturn(phStdInW, VERR_INVALID_POINTER);
+
     int rc = RTPollSetRemove(hPollSet, VBOXSERVICECTRLPIPEID_STDIN);
     if (rc != VERR_POLL_HANDLE_ID_NOT_FOUND)
         AssertRC(rc);
 
-    rc = RTPipeClose(*phStdInW);
-    AssertRC(rc);
-    *phStdInW = NIL_RTPIPE;
+    if (*phStdInW != NIL_RTPIPE)
+    {
+        rc = RTPipeClose(*phStdInW);
+        AssertRC(rc);
+        *phStdInW = NIL_RTPIPE;
+    }
 
     return rc;
@@ -453 +458 @@
 
             size_t cbWritten = 0;
-            if (*phStdInW != NIL_RTPIPE)
+            if (   *phStdInW != NIL_RTPIPE
+                && pRequest->cbData)
             {
                 rcReq = RTPipeWrite(*phStdInW,
@@ -466 +472 @@
              * the poll set.
              */
-            if (   pRequest->enmType == VBOXSERVICECTRLREQUEST_STDIN_WRITE_EOF)
+            if (   pRequest->enmType == VBOXSERVICECTRLREQUEST_STDIN_WRITE_EOF
                 && pRequest->cbData  == cbWritten)
             {
-                    rc = VBoxServiceControlThreadCloseStdIn(hPollSet, phStdInW);
+                rc = VBoxServiceControlThreadCloseStdIn(hPollSet, phStdInW);
             }