Skip to content

Commit

Permalink
caja-desktop-directory: stop segfaults in directory_ready_callback
Browse files Browse the repository at this point in the history
Prevent segfault on g_list_find in directory_ready_callback by catching the NULL case
  • Loading branch information
lukefromdc committed Jul 15, 2018
1 parent a2fa06f commit 5b20286
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions libcaja-private/caja-desktop-directory.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit 5b20286

Please sign in to comment.