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

add this in here just in case

Browse Source
This commit is contained in:
Caolán McNamara 2011-12-15 16:48:48 +00:00
parent e3247db8d8
commit 5d880b1d4d
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch Normal file
View File

@ -0,0 +1,41 @@
From d11f2ccdcecca78bc654ca0b787ea112c1dfe10c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 15 Dec 2011 11:57:08 +0100
Subject: [PATCH] Resolves: rhbz#767708 avoid SIGBUS writing to overcommitted
mmaped diskspace
---
bridges/source/cpp_uno/shared/vtablefactory.cxx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 2703ac0..b049c7f 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -65,6 +66,10 @@
#error Unsupported platform
#endif
+#if defined USE_DOUBLE_MMAP
+#include <fcntl.h>
+#endif
+
using bridges::cpp_uno::shared::VtableFactory;
namespace {
@@ -259,9 +264,10 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
}
unlink(tmpfname);
delete[] tmpfname;
- if (ftruncate(block.fd, block.size) == -1)
+ int err = posix_fallocate(block.fd, 0, block.size);
+ if (err != 0)
{
- perror("truncation of executable memory area failed");
+ fprintf(stderr, "posix_fallocate failed with code %d\n", err);
close(block.fd);
block.fd = -1;
break;
--
1.7.7.4

6
libreoffice.spec
View File

@ -150,6 +150,7 @@ Patch41: libreoffice-ppc64.patch
Patch42: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
Patch43: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
Patch44: 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
Patch45: 0001-Resolves-rhbz-767708-avoid-SIGBUS-writing-to-overcom.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -840,6 +841,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch42 -p1 -b .rhbz751290-KDE-black-on-dark-tooltips.patch
%patch43 -p1 -b .fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
%patch44 -p1 -b .rhbz761009-IFSD_Equal-is-asymmetrical.patch
%patch45 -p1 -b .rhbz767708-avoid-SIGBUS-writing-to-overcom.patch
# these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings
@ -2148,8 +2151,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Tue Dec 13 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.4.2-6
* Thu Dec 15 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.4.2-6
- Resolves: rhbz#761009 IFSD_Equal is asymmetrical
- Resolves: rhbz#767708 write to mmap'ed file w/o disk space: SIGBUS
* Tue Nov 29 2011 Caolán McNamara <caolanm@redhat.com> - 3.4.4.2-5
- Resolves: rhbz#757653 fix headless crash with cairo canvas