rpms/scribus/F-11 scribus-1.3.5-check-hdict.patch, NONE, 1.1 scribus.spec, 1.46, 1.47

Dan Horák sharkcz at fedoraproject.org
Thu Nov 26 07:40:59 UTC 2009


Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13109

Modified Files:
	scribus.spec 
Added Files:
	scribus-1.3.5-check-hdict.patch 
Log Message:
* Wed Nov 25 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-2
- fixed a crash when closing a hyphenator object (#537677)


scribus-1.3.5-check-hdict.patch:
 hyphenator.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE scribus-1.3.5-check-hdict.patch ---
>From dedea3f94802f0f9d9adef4c48f8061282baf776 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 23 Nov 2009 10:13:48 +0100
Subject: [PATCH] check hdict value before freeing the hyphenator

---
 Scribus/scribus/hyphenator.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Scribus/scribus/hyphenator.cpp b/Scribus/scribus/hyphenator.cpp
index 614db47..4da4467 100644
--- a/Scribus/scribus/hyphenator.cpp
+++ b/Scribus/scribus/hyphenator.cpp
@@ -90,7 +90,8 @@ Hyphenator::Hyphenator(QWidget* parent, ScribusDoc *dok) : QObject( parent ),
 
 Hyphenator::~Hyphenator()
 {
-	hnj_hyphen_free(hdict);
+	if (hdict)
+		hnj_hyphen_free(hdict);
 }
 
 void Hyphenator::NewDict(const QString& name)
-- 
1.6.3.3



Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-11/scribus.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- scribus.spec	20 Aug 2009 14:48:46 -0000	1.46
+++ scribus.spec	26 Nov 2009 07:40:58 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -8,6 +8,9 @@ Group:          Applications/Productivit
 License:        GPLv2+
 URL:            http://www.scribus.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# https://bugzilla.redhat.com/show_bug.cgi?id=537677
+# http://bugs.scribus.net/view.php?id=8595
+Patch0:         %{name}-1.3.5-check-hdict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -72,6 +75,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 
 %prep
 %setup -q
+%patch0 -p2 -b .check-hdict
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -166,6 +170,9 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Wed Nov 25 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-2
+- fixed a crash when closing a hyphenator object (#537677)
+
 * Thu Aug 20 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-1
 - update to final 1.3.5.1
 - drop the upstreamed "install-headers" patch




More information about the fedora-extras-commits mailing list