浏览代码

Merge branch 'fix-cmake-server-bad-buffering' into release-3.10

Merge-request: !1498
Brad King 8 年之前
父节点
当前提交
a347de186c
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      Source/cmConnection.cxx

+ 2 - 3
Source/cmConnection.cxx

@@ -97,11 +97,10 @@ void cmEventBasedConnection::ReadData(const std::string& data)
   this->RawReadBuffer += data;
   this->RawReadBuffer += data;
   if (BufferStrategy) {
   if (BufferStrategy) {
     std::string packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
     std::string packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
-    do {
+    while (!packet.empty()) {
       ProcessRequest(packet);
       ProcessRequest(packet);
       packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
       packet = BufferStrategy->BufferMessage(this->RawReadBuffer);
-    } while (!packet.empty());
-
+    }
   } else {
   } else {
     ProcessRequest(this->RawReadBuffer);
     ProcessRequest(this->RawReadBuffer);
     this->RawReadBuffer.clear();
     this->RawReadBuffer.clear();