From 5b20286752e0e923b1ce6298cdcf21e62849ad7e Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Sun, 15 Jul 2018 17:13:26 -0400 Subject: caja-desktop-directory: stop segfaults in directory_ready_callback Prevent segfault on g_list_find in directory_ready_callback by catching the NULL case --- libcaja-private/caja-desktop-directory.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libcaja-private/caja-desktop-directory.c') diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c index de998cd2..5ec63864 100644 --- a/libcaja-private/caja-desktop-directory.c +++ b/libcaja-private/caja-desktop-directory.c @@ -162,6 +162,10 @@ directory_ready_callback (CajaDirectory *directory, g_assert (callback_data != NULL); merged_callback = callback_data; + /*Prevent segfaults on the assert with GTK 3.23*/ + if (merged_callback->non_ready_directories == NULL) + return; + g_assert (g_list_find (merged_callback->non_ready_directories, directory) != NULL); /* Update based on this call. */ -- cgit v1.2.1