rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: rhbz#666440 don't pushback and process a corrupt extension

Browse Source
This commit is contained in:
David Tardon 2011-02-10 15:13:53 +01:00
parent 4090557bb6
commit d378a0d804
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch Normal file
View File

@ -0,0 +1,27 @@
From a0f63a4c3a5430b6b81318f2dc380ca8975d4d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 18 Jan 2011 12:11:52 +0000
Subject: rhbz#666440 don't pushback and process a corrupt extension
Signed-off-by: David Tardon <dtardon@redhat.com>
---
.../deployment/registry/package/dp_package.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 603f524..b084d87 100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1620,7 +1620,8 @@ BackendImpl::PackageImpl::getPackagesFromDb(
Reference<deployment::XPackage> xExtension =
bindBundleItem(i->first, i->second, true, m_identifier, xCmdEnv);
OSL_ASSERT(xExtension.is());
- retVector.push_back(xExtension);
+ if (xExtension.is())
+ retVector.push_back(xExtension);
}
return retVector;
--
1.7.4

3
libreoffice.spec
View File

@ -116,6 +116,7 @@ Patch28: 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
Patch29: 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
Patch30: 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch
Patch31: 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch
Patch32: 0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -750,6 +751,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch29 -p1 -b .rhbz676539-handle-missing-pWindows-from-xW.patch
%patch30 -p1 -b .fdo33750-i94623-use-optimal-border-width-w.patch
%patch31 -p1 -b .rhbz649310-don-t-crash-deregistering-diff.-platform.patch
%patch32 -p1 -b .rhbz666440-don-t-pushback-and-process-a-corrupt-extension.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@ -2105,6 +2107,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
- Resolves: rhbz#676539 handle missing pWindows from xWindows
- Resolves: rhbz#649310 don't crash deregistering diff. platform ext.
(dtardon)
- Resolves: rhbz#666440 don't pushback and process a corrupt extension
* Mon Jan 24 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-2
- Resolves: rhbz#671540 fix lonely )