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

Resolves: rhbz#681738 crash on writing config post-main

Browse Source
This commit is contained in:
Caolán McNamara 2011-03-03 09:54:47 +00:00
parent 95b644fbce
commit ffc282d941
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0001-valgrind-don-t-leave-an-evil-thread-running-after-ma.patch Normal file
View File

@ -0,0 +1,28 @@
From e65850b4411c59a5c664b002c6ab4ae385fd2261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 13 Dec 2010 12:48:47 +0000
Subject: [PATCH] valgrind: don't leave an evil thread running after main is completed
---
configmgr/source/components.cxx | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index e6cfb10..44c2d32 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -595,7 +595,10 @@ Components::Components(
RTL_LOGFILE_TRACE_AUTHOR("configmgr", "sb", "end parsing");
}
-Components::~Components() {}
+Components::~Components()
+{
+ flushModifications();
+}
void Components::parseFileLeniently(
FileParser * parseFile, rtl::OUString const & url, int layer, Data & data,
--
1.7.4.1

5
libreoffice.spec
View File

@ -117,6 +117,7 @@ Patch29: 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.p
Patch30: 0001-Resolves-rhbz-681159-bandaid-for-crash.patch
Patch31: 0001-Resolves-fdo-33701-ensure-node-outlives-path.patch
Patch32: 0001-Resolves-rhbz-672818-bandaid-for-crash-in-SwTxtNode-.patch
Patch33: 0001-valgrind-don-t-leave-an-evil-thread-running-after-ma.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -752,6 +753,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch30 -p1 -b .rhbz681159-bandaid-for-crash.patch
%patch31 -p1 -b .fdo33701-ensure-node-outlives-path.patch
%patch32 -p1 -b .rhbz672818-bandaid-for-crash-in-SwTxtNode-.patch
%patch33 -p1 -b .valgrind-don-t-leave-an-evil-thread-running-after-ma.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip
@ -2097,10 +2099,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url
%changelog
* Wed Mar 01 2011 Caolán McNamara <caolanm@redhat.com> 3.3.1.2-3
* Thu Mar 02 2011 Caolán McNamara <caolanm@redhat.com> 3.3.1.2-3
- Resolves: rhbz#681159 crash in writer
- Resolves: rhbz#672818 crash in writer
- Resolves: fdo#33701 ensure node outlives path
- Resolves: rhbz#681738 crash on writing config post-main
* Thu Feb 17 2011 Caolán McNamara <caolanm@redhat.com> 3.3.1.2-2
- Resolves: rhbz#678284 Calc crashes during cell select with keys