wsd/LOOLWSD.cpp | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 4cb038c60a0fdb22274874701c45156fd51bcad4
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Tue Nov 12 10:37:00 2019 -0500
Commit: Ashod Nakashian <ashnak...@gmail.com>
CommitDate: Tue Nov 12 16:45:19 2019 +0100
wsd: Destroy ChildProcess instances before exit
ChildProcess instances log in the dtor, and this can
happen after the log subsystem has been destroyed,
because the order of destruction is undefined.
NewChildren is destroyed in exit, at which point
we have no control over the log subsystem.
To avoid this inversion of order, we clear
the NewChildren container before exiting.
Change-Id: I7b1bac3123fd7917616c11ab9674534c9222fff1
Reviewed-on: https://gerrit.libreoffice.org/82533
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 4fad66287..6672ec6d2 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3568,6 +3568,8 @@ int LOOLWSD::innerMain()
child->terminate();
}
+ NewChildren.clear();
+
#if !MOBILEAPP
#ifndef KIT_IN_PROCESS
// Wait for forkit process finish.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
