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

[Libreoffice Gerrit user]

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

New commits:
commit d4e7d9818787ae9d17de71f1018157e2a647d96c
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Sat Mar 30 13:24:14 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Mar 30 18:30:38 2019 +0100

    Only erase buffer if socket is not shutting down.
    
    Change-Id: I23886db8d2fdb6297862947e031e14d7a485ecd7
    Reviewed-on: https://gerrit.libreoffice.org/69956
    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 e0536ecd2..75c4ae6e8 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1993,6 +1993,7 @@ private:
                         << "\r\n";
                     socket->send(oss.str());
                     socket->shutdown();
+                    return;
                 }
             }
         }
@@ -2011,6 +2012,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->_inBuffer) << "]: " << exc.what());
+            return;
         }
 
         // if we succeeded - remove the request from our input buffer