Changeset 1623 for box/chris/merge/bin/bbackupquery/BackupQueries.cpp

Timestamp:

29/04/2007 22:31:14 (5 years ago)

Author:

chris

Message:

Read any remaining data from the encoded stream (such as EOF marker)
before discarding it, to ensure that we don't break the protocol.
(refs #2, refs #3)

File:

• box/chris/merge/bin/bbackupquery/BackupQueries.cpp (modified) (2 diffs)

box/chris/merge/bin/bbackupquery/BackupQueries.cpp

@@ -1696 +1696 @@
                                                         }
 
-                                                        // Must always read the entire decoded string, if it's not a symlink
+                                                        // Must always read the entire decoded stream, if it's not a symlink
                                                         if(fileOnServerStream->StreamDataLeft())
                                                         {
@@ -1704 +1704 @@
                                                                 {
                                                                         fileOnServerStream->Read(buffer, sizeof(buffer), mrConnection.GetTimeout());
+                                                                }
+                                                        }
+
+                                                        // Must always read the entire encoded stream
+                                                        if(objectStream->StreamDataLeft())
+                                                        {
+                                                                // Absorb all the data remaining
+                                                                char buffer[2048];
+                                                                while(objectStream->StreamDataLeft())
+                                                                {
+                                                                        objectStream->Read(buffer, sizeof(buffer), mrConnection.GetTimeout());
                                                                 }
                                                         }