jreznik pushed to taskjuggler (epel7). "Fix crash in FileInfo destructor (..more)"

[notifications at fedoraproject.org]

>From 55abe022840feacd4a03ffbd3fe67d1d681915f8 Mon Sep 17 00:00:00 2001
From: Radek Novacek <rnovacek at redhat.com>
Date: Tue, 13 Nov 2012 08:44:19 +0100
Subject: Fix crash in FileInfo destructor

- Resolves: #844730

diff --git a/taskjuggler-2.4.3-fix-segfault-in-destructor.patch b/taskjuggler-2.4.3-fix-segfault-in-destructor.patch
new file mode 100644
index 0000000..c4a1bfd
--- /dev/null
+++ b/taskjuggler-2.4.3-fix-segfault-in-destructor.patch
@@ -0,0 +1,27 @@
+From 00aa3c52d413b4178d981f9c28dc413f7b2e8858 Mon Sep 17 00:00:00 2001
+From: Ludwig Nussel <ludwig.nussel at suse.de>
+Date: Fri, 9 Nov 2012 13:49:23 +0100
+Subject: [PATCH] fix segfault in destructor
+
+---
+ taskjuggler/FileInfo.cpp |    4 ++++
+ 1 Datei geändert, 4 Zeilen hinzugefügt(+)
+
+diff --git a/taskjuggler/FileInfo.cpp b/taskjuggler/FileInfo.cpp
+index 05d475e..d9b7976 100644
+--- a/taskjuggler/FileInfo.cpp
++++ b/taskjuggler/FileInfo.cpp
+@@ -57,6 +57,10 @@ FileInfo::close()
+     if (m_fh == stdin)
+         return true;
+ 
++    // destruct the QTextStream here as it has a reference to m_fh.
++    // auto destruct after the fclose may lead to segfault
++    m_f.reset(NULL);
++
+     if (fclose(m_fh) == EOF)
+         return false;
+ 
+-- 
+1.7.10.4
+
diff --git a/taskjuggler.spec b/taskjuggler.spec
index 2609762..17a09fd 100644
--- a/taskjuggler.spec
+++ b/taskjuggler.spec
@@ -1,6 +1,6 @@
 Name:          taskjuggler
 Version:       2.4.3
-Release:       12%{?dist}
+Release:       13%{?dist}
 Summary:       Project management tool
 
 Group:         Applications/Productivity
@@ -11,6 +11,7 @@ Source1:       %{name}.xml
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:        taskjuggler-2.4.3-fix-reading-gzipped-xml.patch
+Patch1:        taskjuggler-2.4.3-fix-segfault-in-destructor.patch
 
 %if 0%{?fedora} < 10 && 0%{?rhel} < 6
 BuildRequires: kdepim-devel
@@ -49,6 +50,8 @@ Libraries for TaskJuggler package.
 
 # Fix wrong handling memory buffer for reading gzipped xmls
 %patch0 -p1 -b .fix-reading-gzipped-xml
+# Fix crash in FileInfo destructor
+%patch1 -p1
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -140,6 +143,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libtaskjuggler*
 
 %changelog
+* Tue Nov 13 2012 Radek Novacek <rnovacek at redhat.com> 2.4.3-13
+- Fix crash in FileInfo destructor
+- Resolves: #844730
+
 * Mon Jul 23 2012 Radek Novacek <rnovacek at redhat.com> 2.4.3-12
 - Fix reading gzipped XMLs
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/taskjuggler.git/commit/?h=epel7&id=55abe022840feacd4a03ffbd3fe67d1d681915f8