[SCM] kgpg packaging branch, master, updated. debian/4.8.4-2-4-ge063714

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kgpg.git;a=commitdiff;h=90f24ab

The following commit has been merged in the master branch:
commit 90f24ab260f965aa348b5489549ea230a53f431f
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 30 14:05:09 2012 +0200

    fix a crash when setting a new default key
    
    backport upstream commit a3b0cb755ff08721a3b9e2c25d4aaf655fb40804
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 ...x-NULL-deref-when-new-setting-default-key.patch |   35 ++++++++++++++++++++
 3 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a83db4..6874322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kgpg (4:4.8.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream commit a3b0cb755ff08721a3b9e2c25d4aaf655fb40804 to fix
+    a crash when setting a new default key; patch
+    upstream_fix-NULL-deref-when-new-setting-default-key.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 30 Jun 2012 14:01:10 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..47210f2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_fix-NULL-deref-when-new-setting-default-key.patch
diff --git a/debian/patches/upstream_fix-NULL-deref-when-new-setting-default-key.patch b/debian/patches/upstream_fix-NULL-deref-when-new-setting-default-key.patch
new file mode 100644
index 0000000..5c6d390
--- /dev/null
+++ b/debian/patches/upstream_fix-NULL-deref-when-new-setting-default-key.patch
@@ -0,0 +1,35 @@
+From a3b0cb755ff08721a3b9e2c25d4aaf655fb40804 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <kde at opensource.sf-tec.de>
+Date: Wed, 6 Jun 2012 17:40:32 +0200
+Subject: [PATCH 1/3] fix NULL-deref when new setting default key
+
+Thanks to John Tapsell for spotting the line I have been looking at for weeks without seeing the bug.
+
+CCBUG:298465
+CCMAIL:johnflux at gmail.com
+---
+ model/kgpgitemmodel.cpp |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/model/kgpgitemmodel.cpp b/model/kgpgitemmodel.cpp
+index 92207c6..d369346 100644
+--- a/model/kgpgitemmodel.cpp
++++ b/model/kgpgitemmodel.cpp
+@@ -343,8 +343,12 @@ KGpgItemModel::setDefaultKey(KGpgKeyNode *def)
+ 		emit dataChanged(createIndex(odefrow, 0, nd), createIndex(odefrow, lastcol, nd));
+ 	}
+ 
+-	m_default = def->getId();
+-	emit dataChanged(createIndex(defrow, 0, def), createIndex(defrow, lastcol, def));
++	if (def) {
++		m_default = def->getId();
++		emit dataChanged(createIndex(defrow, 0, def), createIndex(defrow, lastcol, def));
++	} else {
++		m_default.clear();
++	}
+ }
+ 
+ QModelIndex
+-- 
+1.7.10
+

-- 
kgpg packaging