external/liborcus/UnpackedTarball_liborcus.mk | 3 +++
external/liborcus/liborcus-handle-invalid-xml.patch.1 | 12 ++++++++++++
2 files changed, 15 insertions(+)
New commits:
commit 86815707be317b8b874b0c595bb586b15f7196d4
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Dec 13 21:06:04 2013 +0100
handle invalid xml files in orcus, fdo#63844
Change-Id: I82fff6ab89acece0e46c92bfca2c7faf967639b8
Signed-off-by: Kohei Yoshida <kohei.yosh...@collabora.com>
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 9e2df47..930543c 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -21,6 +21,9 @@ liborcus_patches += liborcus_0.1.0-configure.patch
# don't use dllimport
liborcus_patches += liborcus_0.1.0-dllimport.patch
+# fdo#63844
+liborcus_patches += liborcus-handle-invalid-xml.patch.1
+
ifeq ($(OS),MACOSX)
# no "tac" command on OS X, but "tail -r"
liborcus_patches += liborcus_0.1.0-tac.patch
diff --git a/external/liborcus/liborcus-handle-invalid-xml.patch.1
b/external/liborcus/liborcus-handle-invalid-xml.patch.1
new file mode 100644
index 0000000..4cb091d
--- /dev/null
+++ b/external/liborcus/liborcus-handle-invalid-xml.patch.1
@@ -0,0 +1,12 @@
+diff -ur liborcus.org/include/orcus/sax_parser.hpp
liborcus/include/orcus/sax_parser.hpp
+--- liborcus.org/include/orcus/sax_parser.hpp 2013-12-13 20:51:55.126503773
+0100
++++ liborcus/include/orcus/sax_parser.hpp 2013-12-13 20:57:39.076174743
+0100
+@@ -278,6 +278,8 @@
+ special_tag();
+ break;
+ default:
++ if (!is_alpha(c))
++ throw malformed_xml_error("expect an alphabet.");
+ element_open(pos);
+ }
+ }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
