1From 7d49b889d1b244d037aa5495865a30cdffdb5d94 Mon Sep 17 00:00:00 2001
2From: Bastien Nocera <hadess@hadess.net>
3Date: Fri, 18 Sep 2020 12:06:45 +0200
4Subject: [PATCH 1/2] Fix infinite loop if thumbnailer is not available
5
6The code in cheese_thumb_view_idle_append_item() in
7src/thumbview/cheese-thumb-view.c didn't pop the list of items to
8thumbnail if thumbnailing failed.
9
10 #0  0x00007f4a60e55314 in open64 () at /lib64/libc.so.6
11 #1  0x00007f4a60de6386 in _IO_file_open () at /lib64/libc.so.6
12 #2  0x00007f4a60de655a in __GI__IO_file_fopen () at /lib64/libc.so.6
13 #3  0x00007f4a60dd9aad in __fopen_internal () at /lib64/libc.so.6
14 #4  0x00007f4a6157a43f in gdk_pixbuf_new_from_file () at /lib64/libgdk_pixbuf-2.0.so.0
15 #5  0x00007f4a61e84b3a in gnome_desktop_thumbnail_factory_lookup () at /lib64/libgnome-desktop-3.so.19
16 #6  0x000055cef476046f in cheese_thumb_view_idle_append_item ()
17 #7  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
18 #8  0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
19 #9  0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
20 #10 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
21 #11 0x00007f4a6146a7ca in g_application_run () at /lib64/libgio-2.0.so.0
22 #12 0x000055cef4758547 in _vala_main ()
23 #13 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
24 #14 0x000055cef47554be in _start ()
25
26 #0  0x00007f4a60ec562d in __strlen_avx2 () at /lib64/libc.so.6
27 #1  0x00007f4a61275de8 in g_str_has_suffix () at /lib64/libglib-2.0.so.0
28 #2  0x00007f4a618c0072 in icon_name_is_symbolic () at /lib64/libgtk-3.so.0
29 #3  0x00007f4a618c00b1 in theme_dir_get_icon_suffix () at /lib64/libgtk-3.so.0
30 #4  0x00007f4a618c32ed in theme_lookup_icon () at /lib64/libgtk-3.so.0
31 #5  0x00007f4a618c3adf in real_choose_icon () at /lib64/libgtk-3.so.0
32 #6  0x00007f4a618c4762 in gtk_icon_theme_lookup_icon_for_scale () at /lib64/libgtk-3.so.0
33 #7  0x00007f4a618c5105 in gtk_icon_theme_load_icon_for_scale () at /lib64/libgtk-3.so.0
34 #8  0x000055cef47605c9 in cheese_thumb_view_idle_append_item ()
35 #9  0x00007f4a6124f47b in g_idle_dispatch () at /lib64/libglib-2.0.so.0
36 #10 0x00007f4a612537af in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
37 #11 0x00007f4a61253b38 in g_main_context_iterate.constprop () at /lib64/libglib-2.0.so.0
38 #12 0x00007f4a61253c03 in g_main_context_iteration () at /lib64/libglib-2.0.so.0
39 #13 0x00007f4a6146a7d8 in g_application_run () at /lib64/libgio-2.0.so.0
40 #14 0x000055cef4758547 in _vala_main ()
41 #15 0x00007f4a60d8a042 in __libc_start_main () at /lib64/libc.so.6
42 #16 0x000055cef47554be in _start ()
43
44Closes: #81
45---
46 src/thumbview/cheese-thumb-view.c | 5 +++--
47 1 file changed, 3 insertions(+), 2 deletions(-)
48
49diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
50index 1d2d88f5..232fd4b6 100644
51--- a/src/thumbview/cheese-thumb-view.c
52+++ b/src/thumbview/cheese-thumb-view.c
53@@ -92,7 +92,7 @@ GtkWidget * cheese_thumb_view_new (void);
54 static gboolean
55 cheese_thumb_view_idle_append_item (gpointer data)
56 {
57-  CheeseThumbViewIdleData *item = g_queue_peek_head (data);
58+  CheeseThumbViewIdleData *item = g_queue_pop_head (data);
59   CheeseThumbView         *thumb_view;
60   CheeseThumbViewPrivate  *priv;
61
62@@ -119,6 +119,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
63   if (!info)
64   {
65     g_warning ("Invalid filename\n");
66+    g_slice_free (CheeseThumbViewIdleData, item);
67     return TRUE;
68   }
69   g_file_info_get_modification_time (info, &mtime);
70@@ -167,6 +168,7 @@ cheese_thumb_view_idle_append_item (gpointer data)
71     if (error)
72     {
73       g_warning ("%s", error->message);
74+      g_slice_free (CheeseThumbViewIdleData, item);
75       return TRUE;
76     }
77   }
78@@ -183,7 +185,6 @@ cheese_thumb_view_idle_append_item (gpointer data)
79   g_object_unref (pixbuf);
80   g_object_unref (file);
81   g_slice_free (CheeseThumbViewIdleData, item);
82-  g_queue_pop_head (data);
83
84   return TRUE;
85 }
86--
872.34.1
88
89