[libreoffice/f15] Resolves: fdo#35513 avoid crash while processing incorrect print range
Caolan McNamara
caolanm at fedoraproject.org
Tue Sep 20 10:12:17 UTC 2011
commit d48177f4b2705f72b05b8b99447d79b27d1cdbe7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Sep 20 11:12:03 2011 +0100
Resolves: fdo#35513 avoid crash while processing incorrect print range
...-35513-avoid-crash-while-processing-incor.patch | 27 ++++++++++++++++++++
libreoffice.spec | 5 +++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
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 <timofeev.i.s at gmail.com>
+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 738af4e..8b23999 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -160,6 +160,7 @@ Patch71: 0001-Resolves-fdo-39159-don-t-restore-original-view-setti.patch
Patch72: 0001-catch-exceptions-from-missing-components-here-as-wel.patch
Patch73: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
Patch74: 0001-On-recovery-from-an-autosave-file-use-DefaultFilter-.patch
+Patch75: 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}
@@ -839,6 +840,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch72 -p1 -b .catch-exceptions-from-missing-components-here-as-wel.patch
%patch73 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch
%patch74 -p1 -b .On-recovery-from-an-autosave-file-use-DefaultFilter-.patch
+%patch75 -p1 -b .fdo-35513-avoid-crash-while-processing-incor.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
@@ -2183,8 +2185,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
-* Mon Sep 19 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-7.UNBUILT
+* Tue Sep 20 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-7.UNBUILT
- Resolves: rhbz#739407 recovery from autosave for non odf format
+- Resolves: fdo#35513 avoid crash while processing incorrect print range
* Thu Sep 15 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-6
- Resolves: fdo#40303 missing filter detect services cause trouble
More information about the scm-commits
mailing list