summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-10-31 11:33:16 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-10-31 11:35:14 +0100
commitcad751d28c356ef302f8eeb0d112a8a0e16dedbc (patch)
treeb4740638670fe9cd2c9b45d558f93ece20f1c852 /external
parente8e12b32ae23ee9b1613ef7794b83adbde27e9f8 (diff)
libetonyek: I assume this is what was intended?
...at least it makes JunitTest_chart2_unoapi not crash any more. Change-Id: Ibc14f141398e518ab8f06b661a198d50c7732e4a
Diffstat (limited to 'external')
-rw-r--r--external/libetonyek/UnpackedTarball_libetonyek.mk1
-rw-r--r--external/libetonyek/libetonyek-doubledelete.patch.018
2 files changed, 19 insertions, 0 deletions
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 173a6c82f619..1a6b32da66bf 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 000000000000..a377c443dabe
--- /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;
+ }
+ }
+