wsd/LOOLWSD.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
New commits: commit 0b6fe97b711a2b286cb53177a09d1bb8d882a2c0 Author: Michael Meeks <[email protected]> Date: Thu Dec 8 14:52:31 2016 +0000 Don't take down WSD with an assert on a badly formed URI. Change-Id: I30118324a997e8604e87e610ee479e40c30a51d2 Reviewed-on: https://gerrit.libreoffice.org/31786 Reviewed-by: Jan Holesovsky <[email protected]> Tested-by: Jan Holesovsky <[email protected]> diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index c0a5246..617276e 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -1256,7 +1256,11 @@ public: { LOG_TRC("Child connection with URI [" << request.getURI() << "]."); assert(request.serverAddress().port() == MasterPortNumber); - assert(request.getURI().find(NEW_CHILD_URI) == 0); + if (request.getURI().find(NEW_CHILD_URI) != 0) + { + LOG_ERR("Invalid incoming URI."); + return; + } // New Child is spawned. const auto params = Poco::URI(request.getURI()).getQueryParameters(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
