[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 wsd/LOOLWSD.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8f77cd1abbe7d7cd44c544e05eaed18cd8da200d
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Mar 30 11:38:17 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Mar 30 18:31:05 2019 +0100

    Only erase buffer if socket is not shutting down.
    
    Change-Id: I23886db8d2fdb6297862947e031e14d7a485ecd7
    Reviewed-on: https://gerrit.libreoffice.org/69955
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 9227f6f3f..a0a4eed48 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2136,6 +2136,7 @@ private:
                         << "\r\n";
                     socket->send(oss.str());
                     socket->shutdown();
+                    return;
                 }
             }
         }
@@ -2154,6 +2155,7 @@ private:
             // NOTE: Check _wsState to choose between HTTP response or WebSocket (app-level) error.
             LOG_INF("#" << socket->getFD() << " Exception while processing incoming request: [" <<
                     LOOLProtocol::getAbbreviatedMessage(socket->getInBuffer()) << "]: " << exc.what());
+            return;
         }
 
         // if we succeeded - remove the request from our input buffer