external/liborcus/UnpackedTarball_liborcus.mk | 1 +
external/liborcus/nullptr-in-ostringstream.patch.1 | 12 ++++++++++++
2 files changed, 13 insertions(+)
New commits:
commit d8c2996be1fec26d75f8bd9ba83194dca0531fdf
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Jun 30 14:39:08 2017 +0200
fix crash on windows with nullptr in operator<<
E.g.
http://crashreport.libreoffice.org/stats/crash_details/8962b764-6550-45c9-b08b-e99f5c968d61
Change-Id: I1153c0ab35266006ada10611e79b770ef1c0cd4f
Reviewed-on: https://gerrit.libreoffice.org/39413
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/39425
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 5d09d6de7ccd..93b988553116 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
external/liborcus/visibility.patch.0 \
+ external/liborcus/nullptr-in-ostringstream.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/nullptr-in-ostringstream.patch.1
b/external/liborcus/nullptr-in-ostringstream.patch.1
new file mode 100644
index 000000000000..d8b97ee2c92a
--- /dev/null
+++ b/external/liborcus/nullptr-in-ostringstream.patch.1
@@ -0,0 +1,12 @@
+diff -ur liborcus.org/src/liborcus/xml_context_base.cpp
liborcus/src/liborcus/xml_context_base.cpp
+--- liborcus.org/src/liborcus/xml_context_base.cpp 2017-06-30
14:32:19.044195127 +0200
++++ liborcus/src/liborcus/xml_context_base.cpp 2017-06-30 14:34:27.580268421
+0200
+@@ -171,7 +171,7 @@
+
+ // Create a generic error message.
+ ostringstream os;
+- os << "element '" << ns << ":" << m_tokens.get_token_name(name) << "'
expected, but '";
++ os << "element '" << (ns ? ns : "") << ":" <<
m_tokens.get_token_name(name) << "' expected, but '";
+ os << elem.first << ":" << m_tokens.get_token_name(elem.second) << "'
encountered.";
+ throw xml_structure_error(os.str());
+ }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
