Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / nautilus
Commits: 0f23db35 by Philipp Unger at 2024-12-23T00:27:20+01:00 add patch file to fix plugin crash - - - - - 2 changed files: - + 0001-check-for-NULL-pointer-in-finish_info_provider-and-i.patch - PKGBUILD Changes: ===================================== 0001-check-for-NULL-pointer-in-finish_info_provider-and-i.patch ===================================== @@ -0,0 +1,51 @@ +From 9482e20e25970901e9b9024a9eb0c1bd4b4d384f Mon Sep 17 00:00:00 2001 +From: Philipp Unger <[email protected]> +Date: Sun, 22 Dec 2024 14:54:03 +0100 +Subject: [PATCH] check for NULL pointer in finish_info_provider and + info_provider_idle_callback + +--- + src/nautilus-directory-async.c | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c +index 48e295c31..15a42ccfc 100644 +--- a/src/nautilus-directory-async.c ++++ b/src/nautilus-directory-async.c +@@ -3704,6 +3704,18 @@ finish_info_provider (NautilusDirectory *directory, + NautilusFile *file, + NautilusInfoProvider *provider) + { ++ if (directory == NULL) ++ { ++ g_warning ("Unexpected NULL directory in finish_info_provider"); ++ return; ++ } ++ ++ if (file == NULL) ++ { ++ g_warning ("Unexpected NULL file in finish_info_provider"); ++ return; ++ } ++ + file->details->pending_info_providers = + g_list_remove (file->details->pending_info_providers, + provider); +@@ -3727,8 +3739,12 @@ info_provider_idle_callback (gpointer user_data) + response = user_data; + directory = response->directory; + +- if (response->handle != directory->details->extension_info_in_progress +- || response->provider != directory->details->extension_info_provider) ++ if (directory == NULL) ++ { ++ g_warning ("Unexpected NULL directory in info_provider_idle_callback"); ++ } ++ else if (response->handle != directory->details->extension_info_in_progress ++ || response->provider != directory->details->extension_info_provider) + { + g_warning ("Unexpected plugin response. This probably indicates a bug in a Nautilus extension: handle=%p", response->handle); + } +-- +2.47.1 + ===================================== PKGBUILD ===================================== @@ -53,9 +53,11 @@ checkdepends=(python-gobject) source=( "git+https://gitlab.gnome.org/GNOME/nautilus.git#tag=${pkgver/[a-z]/.&}"; 0001-Disable-tracker-test.patch + 0001-check-for-NULL-pointer-in-finish_info_provider-and-i.patch ) b2sums=('abec4401ee2f599b9cb1bfbff6b111d2da965356da0c567f6c5bce97e1f6411862454400810a33424fd77afb50f8a3a70552b0e3bc57cfd4bee32462b83492a9' - '8befc868af7e4dc776c50c10d0c6852d237f41b1f4adf8c15e0c378a9ff035e38b2cd22926d313850babcd6c96b6dd2be95fa9e1299383e686ad5a0ff36b957f') + '8befc868af7e4dc776c50c10d0c6852d237f41b1f4adf8c15e0c378a9ff035e38b2cd22926d313850babcd6c96b6dd2be95fa9e1299383e686ad5a0ff36b957f' + '84f6b0797cf2a70daa56ad3fb336c89ce2d87464729edaa0cb0229daf7d8099d1fccb1e4003aa0c914e93f3764184d53e019132ddba6e123e4111ee87a85877e') validpgpkeys=( 6B211753AC950672287226800538577822AE4B17 # António Fernandes <[email protected]> 550660707A6F40376B9B9F8D504A78811E6160CC # Corey Berla <[email protected]> @@ -66,6 +68,7 @@ prepare() { # Tracker test is broken in our build containers git apply -3 ../0001-Disable-tracker-test.patch + git apply -3 ../0001-check-for-NULL-pointer-in-finish_info_provider-and-i.patch } build() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/nautilus/-/commit/0f23db35acd3e5d15b001e5dd9f802288386f823 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/nautilus/-/commit/0f23db35acd3e5d15b001e5dd9f802288386f823 You're receiving this email because of your account on gitlab.archlinux.org.
