external/liborcus/UnpackedTarball_liborcus.mk | 1 +
external/liborcus/silence-assert.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
New commits:
commit e5e8181161632ace434359de2a983ae425670c40
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Nov 23 15:33:54 2017 +0000
crashtesting: assert from liborcus
Change-Id: I3b148354745fa419b6299b6456d24925ea4fb980
Reviewed-on: https://gerrit.libreoffice.org/45160
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index b3261a5fa993..e9270c24a5cb 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,6 +18,7 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,liborcus))
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
+ external/liborcus/silence-assert.patch \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/silence-assert.patch
b/external/liborcus/silence-assert.patch
new file mode 100644
index 000000000000..fb0bba200df7
--- /dev/null
+++ b/external/liborcus/silence-assert.patch
@@ -0,0 +1,11 @@
+--- liborcus/src/parser/sax_parser_base.cpp 2017-11-23 15:26:54.307416084
+0000
++++ liborcus/src/parser/sax_parser_base.cpp 2017-11-16 00:38:32.000000000
+0000
+@@ -296,7 +296,7 @@
+ str = pstring(buf.get(), buf.size());
+
+ // Skip the closing quote.
+- assert(cur_char() == '"');
++ assert(!has_char() || cur_char() == '"');
+ next();
+ }
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
