[Libreoffice-commits] core.git: external/libetonyek

[Stephan Bergmann]

 external/libetonyek/UnpackedTarball_libetonyek.mk   |    1 +
 external/libetonyek/libetonyek-doubledelete.patch.0 |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit cad751d28c356ef302f8eeb0d112a8a0e16dedbc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 31 11:33:16 2013 +0100

    libetonyek: I assume this is what was intended?
    
    ...at least it makes JunitTest_chart2_unoapi not crash any more.
    
    Change-Id: Ibc14f141398e518ab8f06b661a198d50c7732e4a

diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 173a6c8..1a6b32d 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 	external/libetonyek/0001-fix-windows-build.patch \
+	external/libetonyek/libetonyek-doubledelete.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/libetonyek-doubledelete.patch.0 b/external/libetonyek/libetonyek-doubledelete.patch.0
new file mode 100644
index 0000000..a377c44
--- /dev/null
+++ b/external/libetonyek/libetonyek-doubledelete.patch.0
@@ -0,0 +1,18 @@
+--- src/lib/KEYXMLReader.cpp
++++ src/lib/KEYXMLReader.cpp
+@@ -335,6 +335,7 @@
+   catch (...)
+   {
+     delete m_impl;
++    throw;
+   }
+ }
+
+@@ -350,6 +351,7 @@
+   catch (...)
+   {
+     delete m_impl;
++    throw;
+   }
+ }
+