[neon/kde/kio/Neon/release] debian/patches: add patch from branch advised by kevin

Jonathan Esk-Riddell null at kde.org
Mon Oct 2 16:58:10 BST 2023


Git commit 057dabc1ef4c0dccede49ba2cd037ddfe65eaaed by Jonathan Esk-Riddell.
Committed on 02/10/2023 at 17:57.
Pushed by jriddell into branch 'Neon/release'.

add patch from branch advised by kevin

A  +22   -0    debian/patches/cifs-crash.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/kio/-/commit/057dabc1ef4c0dccede49ba2cd037ddfe65eaaed

diff --git a/debian/patches/cifs-crash.diff b/debian/patches/cifs-crash.diff
new file mode 100644
index 0000000..fd19fc4
--- /dev/null
+++ b/debian/patches/cifs-crash.diff
@@ -0,0 +1,22 @@
+commit 48322f44323a1fc09305d66d9093fe6c3780709e
+Author: Kevin Ottens <kevin.ottens at enioka.com>
+Date:   Fri Sep 15 09:45:58 2023 +0200
+
+    Don't crash if KMountPoint gives nothing back while checking for CIFS
+    
+    BUG: 474451
+
+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");
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0e4fb57..faf086d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ wait_for_a_bit_longer
 Disable-flaky-test.patch
 Disable-baloo-dependant-tests.patch
 #Disable-flaky-test-1.patch
+cifs-crash.diff


More information about the Neon-commits mailing list