commit d5624a40f2c99a4beb27e5914c2fa9cecce259c9
author Brad King <brad.king@kitware.com> Mon Nov 20 15:23:38 2017 +0000
committer Kitware Robot <kwrobot@kitware.com> Mon Nov 20 10:23:48 2017 -0500
tree 4f220f643de57db2ad90e52ee9dc206450b8e4e2
parent 08ce62bee5bee6805fbb01c1821c438028e858dc
parent 01c42155cca188901214abbbf79317f853fe164d

Merge topic 'fix-cmake-server-bad-buffering'

01c42155 server: Fix regression in partial message handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: jdavidberger <j.david.berger@gmail.com>
Merge-request: !1498

Source/cmConnection.cxx

diff --git a/Source/cmConnection.cxx b/Source/cmConnection.cxx
index f482412..28ba12c 100644
--- a/Source/cmConnection.cxx
+++ b/Source/cmConnection.cxx
@@ -97,11 +97,10 @@
   this->RawReadBuffer += data;
   if (BufferStrategy) {
     std::string packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
-    do {
+    while (!packet.empty()) {
       ProcessRequest(packet);
       packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
-    } while (!packet.empty());
-
+    }
   } else {
     ProcessRequest(this->RawReadBuffer);
     this->RawReadBuffer.clear();