apply upstream patch to fix crash when no service was selected

This commit is contained in:
Than Ngo 2012-12-06 13:22:05 +01:00
parent 840ce1b474
commit 4c69567fa0
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 0820b3173aff4f0f3c803a9e75e726024da38ee5 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Thu, 6 Dec 2012 11:55:05 +0100
Subject: [PATCH] Fix crash when no service was selected (user clicked on
"Open With...")
---
kparts/browserrun.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
index 6d84800..6de0380 100644
--- a/kparts/browserrun.cpp
+++ b/kparts/browserrun.cpp
@@ -304,7 +304,7 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable(const QString& _
this, SLOT(slotCopyToTempFileResult(KJob*)) );
return Delayed; // We'll continue after the job has finished
}
- if (selectedService) {
+ if (selectedService && question.selectedService()) {
*selectedService = question.selectedService();
// KRun will use this when starting an app
KRun::setPreferredService(question.selectedService()->desktopEntryName());
--
1.7.7

View File

@ -25,7 +25,7 @@
Summary: KDE Libraries
Version: 4.9.4
Release: 3%{?dist}
Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@ -165,6 +165,7 @@ Patch59: kdelibs-4.9.3-kcm_ssl.patch
## upstream
Patch100: 0001-Revert-Also-check-parent-mimetypes-in-protocolForArc.patch
Patch101: 0001-Fix-crash-when-no-service-was-selected-user-clicked-.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@ -341,6 +342,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstream patches
%patch100 -p1 -b .kio
%patch101 -p1 -b .crash
# security fixes
%patch200 -p1 -b .CVE-2009-2702
@ -600,6 +602,9 @@ rm -rf %{buildroot}
%changelog
* Thu Dec 06 2012 Than Ngo <than@redhat.com> - 6:4.9.4-4
- apply upstream patch to fix crash when no service was selected
* Thu Dec 06 2012 Than Ngo <than@redhat.com> - 6:4.9.4-3
- apply upstream patch to revert the check parent mimetypes in
protocolForArchiveMimetype() (kde#311214)