diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-03-25 09:12:30 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-04-04 19:13:31 +0200 |
| commit | efed5861b51cd54182e2c173a0fc98dee2a7742f (patch) | |
| tree | 59b3abcbaf70fcfadb2a3186de5939f79fe9c72c | |
| parent | 3e57f46c67ae06c30ec2da2c37c602d34af24dab (diff) | |
forcepoint#87 Assertion 'mp_char <= mp_end' failed
Change-Id: I434928cb2425a2e8eb9440dff67f52cda241b2d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132097
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 32019baffa19a8f79cacf93d5dd5a95c7d416657)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132413
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 1 | ||||
| -rw-r--r-- | external/liborcus/forcepoint-87.patch.1 | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 0c54dd5e5ef2..3dbcef54ee52 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/allow-utf-8-in-xml-names.patch \ external/liborcus/forcepoint-83.patch.1 \ external/liborcus/forcepoint-84.patch.1 \ + external/liborcus/forcepoint-87.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/forcepoint-87.patch.1 b/external/liborcus/forcepoint-87.patch.1 new file mode 100644 index 000000000000..ddc9118a43ed --- /dev/null +++ b/external/liborcus/forcepoint-87.patch.1 @@ -0,0 +1,27 @@ +From e4f3741197a3af6d434850d388483b523138a214 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> +Date: Thu, 24 Mar 2022 21:31:14 +0000 +Subject: [PATCH] forcepoint#87 Assertion `mp_char <= mp_end' failed + +soffice.bin: ../../include/orcus/parser_base.hpp:65: bool orcus::parser_base::has_char() const: Assertion `mp_char <= mp_end' failed. +--- + src/parser/sax_parser_base.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp +index 46acb81d..cb7a9c04 100644 +--- a/src/parser/sax_parser_base.cpp ++++ b/src/parser/sax_parser_base.cpp +@@ -293,7 +293,8 @@ + + // Skip the closing quote. + assert(!has_char() || cur_char() == quote_char); +- next(); ++ if (has_char()) ++ next(); + } + + bool parser_base::value(pstring& str, bool decode) +-- +2.35.1 + |