diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-03-25 10:14:19 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2022-04-05 13:41:32 +0200 |
commit | 32abb87ad1c3e866ce88373efb4c8720ee8761d8 (patch) | |
tree | 6e7d9a47e3b3dfc3bfe590f17f099f579009ed0e | |
parent | forcepoint#87 Assertion 'mp_char <= mp_end' failed (diff) | |
download | core-32abb87ad1c3e866ce88373efb4c8720ee8761d8.tar.gz core-32abb87ad1c3e866ce88373efb4c8720ee8761d8.zip |
forcepoint#95 read past end of malformed document
Change-Id: I8b2c558c733af3d7662f668af47e962e252ee339
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132311
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 0b9892fee990b7f6d0457ab6191f87c3991580e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132414
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 13 | ||||
-rw-r--r-- | external/liborcus/forcepoint-95.patch.1 | 11 |
2 files changed, 20 insertions, 4 deletions
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 3dbcef54ee52..e9ce3f16c356 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -15,10 +15,14 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) -# forcepoint-83.patch.1 submitted as -# https://gitlab.com/orcus/orcus/-/merge_requests/117 -# forcepoint-84.patch.1 submitted as -# https://gitlab.com/orcus/orcus/-/merge_requests/118 +# forcepoint-83.patch.1 merged as +# https://gitlab.com/orcus/orcus/-/commit/9f6400b8192e39fefd475a96222713e9e9c60038 +# forcepoint-84.patch.1 merged as +# https://gitlab.com/orcus/orcus/-/commit/223defe95d6f20f1bc5fd22fecc80a79a9519028 +# forcepoint-87.patch.1 merged as +# https://gitlab.com/orcus/orcus/-/commit/a718524ca424fb8a7e7931345a118342d1d4a507 +# forcepoint-95.patch.1 submitted as +# https://gitlab.com/orcus/orcus/-/merge_requests/124 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/rpath.patch.0 \ @@ -34,6 +38,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/forcepoint-83.patch.1 \ external/liborcus/forcepoint-84.patch.1 \ external/liborcus/forcepoint-87.patch.1 \ + external/liborcus/forcepoint-95.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/forcepoint-95.patch.1 b/external/liborcus/forcepoint-95.patch.1 new file mode 100644 index 000000000000..93dc822298b0 --- /dev/null +++ b/external/liborcus/forcepoint-95.patch.1 @@ -0,0 +1,11 @@ +--- a/include/orcus/sax_parser.hpp 2022-03-30 10:54:44.043568760 +0100 ++++ b/include/orcus/sax_parser.hpp 2022-03-30 10:54:55.645037322 +0100 +@@ -547,7 +547,7 @@ + + skip_space_and_control(); + +- char c = cur_char(); ++ char c = cur_char_checked(); + if (c != '=') + { + std::ostringstream os; |