pool/kio-extras5
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 642631 from KDE:Applications

Browse Source 
- Add upstream patch 0001-Avoid-crash-by-not-checking-free-space-for-smb.patch
  * Prevents crashes when browsing smb://

OBS-URL: https://build.opensuse.org/request/show/642631
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio-extras5?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2018-10-22 09:21:22 +00:00 committed by Git OBS Bridge
commit 71012d67f8
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-Avoid-crash-by-not-checking-free-space-for-smb.patch Normal file
View File

@ -0,0 +1,37 @@
From 767415da97a7fae3c5578b9a4fb17a7be041d8ae Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 31 Aug 2018 09:17:17 +0200
Subject: [PATCH] Avoid crash by not checking free space for smb://
This isn't a real location but the overview of all found hosts.
smbc_opendir would succeed but then crash in smbc_fstatvfs
Differential Revision: https://phabricator.kde.org/D15142
(cherry picked from commit 000b1d910b71b491621c7cdbd934c277171c20bf)
---
smb/kio_smb_browse.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp
index 47b2b328..1fa0e6fb 100644
--- a/smb/kio_smb_browse.cpp
+++ b/smb/kio_smb_browse.cpp
@@ -492,6 +492,14 @@ void SMBSlave::fileSystemFreeSpace(const QUrl& url)
{
qCDebug(KIO_SMB) << url;
+ // Avoid crashing in smbc_fstatvfs below when
+ // requesting free space for smb:// which doesn't
+ // make sense to do to begin with
+ if (url.host().isEmpty()) {
+ error(KIO::ERR_COULD_NOT_STAT, url.url());
+ return;
+ }
+
SMBUrl smbcUrl = url;
int handle = smbc_opendir(smbcUrl.toSmbcUrl());
if (handle < 0) {
--
2.19.1

6
kio-extras5.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 17 11:58:56 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
- Add upstream patch 0001-Avoid-crash-by-not-checking-free-space-for-smb.patch
* Prevents crashes when browsing smb://
-------------------------------------------------------------------
Thu Oct 11 20:06:53 UTC 2018 - lbeltrame@kde.org

3
kio-extras5.spec
View File

@ -33,6 +33,8 @@ Source99: %{name}-rpmlintrc
Patch0: fix-mtp-paste-with-KF5-5.25.diff
# PATCH-FEATURE-UPSTREAM
Patch1: 0001-sftp-bump-pending-request-count-from-1-to-128.patch
# PATCH-FIX-UPSTREAM
Patch2: 0001-Avoid-crash-by-not-checking-free-space-for-smb.patch
BuildRequires: OpenEXR-devel
BuildRequires: flac-devel
BuildRequires: gperf
@ -104,6 +106,7 @@ This is the development package for libkioarchive
%prep
%setup -q -n kio-extras-%{version}
%autopatch -p1
sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
%build