summaryrefslogtreecommitdiff
path: root/external/libmwaw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-08-29 12:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-08-29 12:20:00 +0200
commit7a1d8c2187300aaa24d3aea239360bc360d8c950 (patch)
tree1e4ee434eb8ee28467b0df967362be07ac72c5a2 /external/libmwaw
parenta60cc580212e2770c3aef7decfa09b64d4a3e52f (diff)
external/libmwaw: Invalid downcasts to libmwaw_applepict2::OpCode
cf. <https://sourceforge.net/p/libmwaw/tickets/6/> Change-Id: Id59fc23ab25a8b4e12a96a0eb88d091cc5ae6e25
Diffstat (limited to 'external/libmwaw')
-rw-r--r--external/libmwaw/UnpackedTarball_libmwaw.mk1
-rw-r--r--external/libmwaw/ubsan.patch.011
2 files changed, 12 insertions, 0 deletions
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index c1b7db7c12e1..cfa63c56462d 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \
external/libmwaw/0001-msvc2013-does-not-like-this.patch \
external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch \
+ external/libmwaw/ubsan.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libmwaw/ubsan.patch.0 b/external/libmwaw/ubsan.patch.0
new file mode 100644
index 000000000000..26f1d96de95c
--- /dev/null
+++ b/external/libmwaw/ubsan.patch.0
@@ -0,0 +1,11 @@
+See <https://sourceforge.net/p/libmwaw/tickets/6/attachment/minimal.patch>:
+--- src/lib/MWAWPictMac.cxx
++++ src/lib/MWAWPictMac.cxx
+@@ -1060,7 +1060,6 @@
+ if (type5==WP_NONE) return;
+ else m_types.push_back(type5);
+ }
+- virtual ~OpCode() {}
+
+ /** tries to read the data in the file
+ *