Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kio for openSUSE:Factory checked in
at 2023-09-25 20:00:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kio (Old)
and /work/SRC/openSUSE:Factory/.kio.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio"
Mon Sep 25 20:00:09 2023 rev:146 rq:1112067 version:5.110.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kio/kio.changes 2023-09-11 21:23:50.408919702
+0200
+++ /work/SRC/openSUSE:Factory/.kio.new.1770/kio.changes 2023-09-25
20:00:34.524476169 +0200
@@ -1,0 +2,6 @@
+Mon Sep 18 18:44:06 UTC 2023 - Christophe Marin <christo...@krop.fr>
+
+- Add upstream crash fix (kde#474451)
+ * 0001-Don-t-crash-if-KMountPoint-gives-nothing-back-while-.patch
+
+-------------------------------------------------------------------
New:
----
0001-Don-t-crash-if-KMountPoint-gives-nothing-back-while-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kio.spec ++++++
--- /var/tmp/diff_new_pack.euSjcM/_old 2023-09-25 20:00:35.836523472 +0200
+++ /var/tmp/diff_new_pack.euSjcM/_new 2023-09-25 20:00:35.836523472 +0200
@@ -35,6 +35,8 @@
%endif
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to
see into kde4 documentation, needed especially for khelpcenter5
Patch0: kio_help-fallback-to-kde4-docs.patch
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-Don-t-crash-if-KMountPoint-gives-nothing-back-while-.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
# gcc7 is too old for std::transform_reduce
++++++ 0001-Don-t-crash-if-KMountPoint-gives-nothing-back-while-.patch ++++++
>From 48322f44323a1fc09305d66d9093fe6c3780709e Mon Sep 17 00:00:00 2001
From: Kevin Ottens <kevin.ott...@enioka.com>
Date: Fri, 15 Sep 2023 09:45:58 +0200
Subject: [PATCH] Don't crash if KMountPoint gives nothing back while checking
for CIFS
BUG: 474451
---
src/ioslaves/file/file_unix.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
index 87c47e7e7..c0bc64354 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
@@ -328,6 +328,9 @@ inline static time_t stat_mtime(const QT_STATBUF &buf)
static bool isOnCifsMount(const QString &filePath)
{
const auto mount = KMountPoint::currentMountPoints().findByPath(filePath);
+ if (!mount) {
+ return false;
+ }
return mount->mountType() == QStringLiteral("cifs") || mount->mountType()
== QStringLiteral("smb3");
}
--
2.42.0
