Hello community,
here is the log from the commit of package kio-extras5 for openSUSE:Factory
checked in at 2018-10-22 11:21:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kio-extras5 (Old)
and /work/SRC/openSUSE:Factory/.kio-extras5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio-extras5"
Mon Oct 22 11:21:22 2018 rev:63 rq:642631 version:18.08.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/kio-extras5/kio-extras5.changes 2018-10-15
09:26:13.096327828 +0200
+++ /work/SRC/openSUSE:Factory/.kio-extras5.new/kio-extras5.changes
2018-10-22 11:22:18.167218822 +0200
@@ -1,0 +2,6 @@
+Wed Oct 17 11:58:56 UTC 2018 - Luca Beltrame <lbeltr...@kde.org>
+
+- Add upstream patch 0001-Avoid-crash-by-not-checking-free-space-for-smb.patch
+ * Prevents crashes when browsing smb://
+
+-------------------------------------------------------------------
New:
----
0001-Avoid-crash-by-not-checking-free-space-for-smb.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kio-extras5.spec ++++++
--- /var/tmp/diff_new_pack.im1SFZ/_old 2018-10-22 11:22:19.863217103 +0200
+++ /var/tmp/diff_new_pack.im1SFZ/_new 2018-10-22 11:22:19.867217100 +0200
@@ -33,6 +33,8 @@
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 @@
%prep
%setup -q -n kio-extras-%{version}
%autopatch -p1
+
sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
%build
++++++ 0001-Avoid-crash-by-not-checking-free-space-for-smb.patch ++++++
>From 767415da97a7fae3c5578b9a4fb17a7be041d8ae Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <k...@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
