external/liborcus/UnpackedTarball_liborcus.mk | 1 + external/liborcus/nullptr-in-ostringstream.patch.1 | 12 ++++++++++++ sc/source/core/data/documen7.cxx | 3 +++ 3 files changed, 16 insertions(+)
New commits: commit 1e812fbaefb0a273c236ff1917df2b5dcad4e653 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 Reviewed-on: https://gerrit.libreoffice.org/39413 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> (cherry picked from commit ec822b7b716ebb14e717513aeaaf97a45b98bee9) Change-Id: I1153c0ab35266006ada10611e79b770ef1c0cd4f 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()); + } commit 96c2cc411faae6059725dd951d50704ccc8151af Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Jun 30 13:59:57 2017 +0200 pBASM can be nullptr in copy docs, e.g. during insert sheet from doc Found through http://crashreport.libreoffice.org/stats/crash_details/3bd264ba-ec12-476a-9bb4-e832caca3445 Reviewed-on: https://gerrit.libreoffice.org/39411 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> (cherry picked from commit caf1ddedbef77ac648d8b8b35978a0613aa77da6) Change-Id: I0a4e6dddca61a2538c0fe6bbc51770a9886c464d diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index 437cf4c815e6..58ce9827f2ca 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -558,6 +558,9 @@ void ScDocument::FinalTrackFormulas( sal_uInt32 nHintId ) */ void ScDocument::TrackFormulas( sal_uInt32 nHintId ) { + if (!pBASM) + return; + if (pBASM->IsInBulkBroadcast() && !IsFinalTrackFormulas() && nHintId == SC_HINT_DATACHANGED) { SetTrackFormulasPending(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits