test/source/vclbootstrapprotector.cxx | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 6a49f78b36243ba1ed1dbf2f9bd893c7a660a983
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Dec 3 21:00:37 2017 +0000
silence coverity#1421122 Uncaught exception
Change-Id: I371951b0e5a0f8c6fe796ff94dc60e07944c3f0f
Reviewed-on: https://gerrit.libreoffice.org/45758
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/test/source/vclbootstrapprotector.cxx
b/test/source/vclbootstrapprotector.cxx
index 786e3774be83..cf6341737919 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -28,9 +28,18 @@ public:
private:
virtual ~Protector() override {
- DeInitVCL();
- // for the 6 tests that use it
- comphelper::ThreadPool::getSharedOptimalPool().shutdown();
+#if defined(__COVERITY__)
+ try {
+#endif
+ DeInitVCL();
+ // for the 6 tests that use it
+ comphelper::ThreadPool::getSharedOptimalPool().shutdown();
+#if defined(__COVERITY__)
+ } catch (const std::exception& e) {
+ SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ std::terminate();
+ }
+#endif
}
virtual bool protect(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
