loolwsd/DocumentBroker.cpp | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit f3ffd5986039058a1dda24cb0ce3d8ca3fd331a2
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sun Nov 6 23:01:29 2016 -0500
loolwsd: assert ChildProcess doesn't destroy DocumentBroker
Change-Id: Iff20323f809f255557e05652ba08f7688b823fe1
Reviewed-on: https://gerrit.libreoffice.org/30645
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 7e250e4..50208ba 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -50,6 +50,9 @@ void ChildProcess::socketProcessor()
auto docBroker = this->_docBroker.lock();
if (docBroker)
{
+ // We should never destroy the broker, since
+ // it owns us and will wait on this thread.
+ assert(docBroker.use_count() > 1);
return docBroker->handleInput(payload);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
