From e5d6351f23c750a351fcb9872b1c582d5327a85f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 31 Jul 2020 12:44:02 +0200
Subject: fix leak in CppunitTest_cppcanvas_test

Change-Id: Iecdbbec18a8d88872878a8fa9a17f7040677384c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99863
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 canvas/source/cairo/cairo_canvas.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'canvas/source/cairo')

diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 02ab55419d5b..64c65d4cd904 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -181,7 +181,13 @@ com_sun_star_comp_rendering_Canvas_Cairo_get_implementation(
 {
     auto p = new cairocanvas::Canvas(args, context);
     p->acquire();
-    p->initialize();
+    try {
+        p->initialize();
+    } catch (css::uno::Exception&) {
+        p->dispose();
+        p->release();
+        throw;
+    }
     return static_cast<cppu::OWeakObject*>(p);
 }
 
-- 
cgit