[choqok] - fix segfault on exit (kde bz #249748)

Sven Lankes slankes at fedoraproject.org
Wed Sep 1 17:56:21 UTC 2010


commit 73b635a8066cf08a92f538643662b27f146bfbd6
Author: Sven Lankes <sven at lank.es>
Date:   Wed Sep 1 19:55:45 2010 +0200

    - fix segfault on exit (kde bz #249748)

 choqok-segfaultonexit.patch |   17 +++++++++++++++++
 choqok.spec                 |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/choqok-segfaultonexit.patch b/choqok-segfaultonexit.patch
new file mode 100644
index 0000000..b14cc7b
--- /dev/null
+++ b/choqok-segfaultonexit.patch
@@ -0,0 +1,17 @@
+--- libchoqok/passwordmanager.cpp	2010/09/01 16:12:59	1170612
++++ libchoqok/passwordmanager.cpp	2010/09/01 16:38:10	1170613
+@@ -37,11 +37,12 @@
+ {
+ public:
+     Private()
+-    : wallet(0), conf(0)
++    : wallet(0), conf(0), cfg(0)
+     {}
+ 
+     ~Private() {
+-        cfg->sync();
++        if(cfg)
++            cfg->sync();
+         delete wallet;
+         delete conf;
+         delete cfg;
diff --git a/choqok.spec b/choqok.spec
index f6d4ce3..d21ae5c 100644
--- a/choqok.spec
+++ b/choqok.spec
@@ -1,11 +1,12 @@
 Summary: KDE Micro-Blogging Client
 Name: choqok
 Version: 0.9.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3
 Group: Applications/Internet
 URL: http://choqok.gnufolks.org/
 Source: http://d10xg45o6p6dbl.cloudfront.net/projects/c/%{name}/%{name}-%{version}.tar.bz2
+Patch0: choqok-segfaultonexit.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,6 +45,7 @@ Requires: kdelibs4-devel
 
 %prep
 %setup -q 
+%patch0 -p0 -b .segfaultonexit
 
 %build
 mkdir -p %{_target_platform}
@@ -113,6 +115,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %{_kde4_sharedir}/kde4/apps/cmake/modules/*.cmake
 
 %changelog
+* Wed Sep 01 2010 Sven Lankes <sven at lank.es> - 0.9.90-2
+- fix segfault on exit (kde bz #249748)
+
 * Wed Sep 01 2010 Sven Lankes <sven at lank.es> - 0.9.90-1
 - new upstream release
 


More information about the scm-commits mailing list