From fd60d176941dc4fcb449e16165fc3ac53c8b6418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 20 Sep 2011 11:06:19 +0100 Subject: [PATCH] Resolves: fdo#35513 avoid crash while processing incorrect print range --- ...3-avoid-crash-while-processing-incor.patch | 27 +++++++++++++++++++ libreoffice.spec | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch diff --git a/0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch b/0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch new file mode 100644 index 0000000..5b86791 --- /dev/null +++ b/0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch @@ -0,0 +1,27 @@ +From b7d874f49b102eabe2974c4dee1272d2cf6053a3 Mon Sep 17 00:00:00 2001 +From: Ivan Timofeev +Date: Tue, 20 Sep 2011 10:55:50 +0100 +Subject: [PATCH] Fix for fdo#35513: avoid crash while processing incorrect + range of pages + +--- + sw/source/core/doc/doc.cxx | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx +index 34d7a96..d83ab53 100644 +--- a/sw/source/core/doc/doc.cxx ++++ b/sw/source/core/doc/doc.cxx +@@ -1638,6 +1638,9 @@ void SwDoc::CalculatePagePairsForProspectPrinting( + StringRangeEnumerator::getRangesFromString( + aPageRange, aPagesToPrint, 1, nDocPageCount, 0 ); + ++ if (!aPagesToPrint.size()) ++ return; ++ + // now fill the vector for calculating the page pairs with the start frames + // from the above obtained vector + std::vector< const SwPageFrm * > aVec; +-- +1.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 65572c6..0737004 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -124,6 +124,7 @@ Patch29: 0001-Related-fdo-37195-migrationoo3-not-registered.patch Patch30: 0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch Patch31: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch Patch32: fdo40856.bn.discard.patch +Patch33: 0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -798,6 +799,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch30 -p1 -b .rhbz735182-libreoffice-doesn-t-build-with-.patch %patch31 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch %patch32 -p1 -b .fdo40856.bn.discard.patch +%patch33 -p1 -b .fdo35513-avoid-crash-while-processing-incor.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2098,6 +2100,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Tue Sep 20 2011 Caolán McNamara - 3.4.3.2-11 - Resolves: rhbz#738133 fix bn discard string +- Resolves: fdo#35513 avoid crash while processing incorrect print range * Mon Sep 19 2011 Marek Kasik - 3.4.3.2-10 - Rebuild (poppler-0.17.3)