Commit 480c0663 authored by afdw's avatar afdw Committed by Alexander Schwinn
Browse files

Add checks for 0 handles (Bug #14122)


(cherry picked from commit 98394ef9)
parent 28e5098d
Loading
Loading
Loading
Loading
+21 −2
Original line number Diff line number Diff line
@@ -355,10 +355,17 @@ thunar_thumbnailer_queue_async_reply (GObject *proxy,
      thunar_thumbnailer_free_job (job);
    }
  else if (error == NULL)
    {
      if (handle == 0)
        {
          g_printerr ("ThunarThumbnailer: got 0 handle (Queue)\n");
        }
      else
        {
          /* store the handle returned by tumbler */
          job->handle = handle;
        }
    }
  else
    {
      g_printerr ("ThunarThumbnailer: Queue failed: %s\n", error->message);
@@ -871,6 +878,12 @@ thunar_thumbnailer_thumbnailer_finished (GDBusProxy *proxy,
  _thunar_return_if_fail (G_IS_DBUS_PROXY (proxy));
  _thunar_return_if_fail (THUNAR_IS_THUMBNAILER (thumbnailer));

  if (handle == 0)
    {
      g_printerr ("ThunarThumbnailer: got 0 handle (Finished)\n");
      return;
    }

  _thumbnailer_lock (thumbnailer);

  for (lp = thumbnailer->jobs; lp != NULL; lp = lp->next)
@@ -912,6 +925,12 @@ thunar_thumbnailer_idle (ThunarThumbnailer *thumbnailer,
  if (G_UNLIKELY (uris == NULL))
    return;

  if (handle == 0)
    {
      g_printerr ("ThunarThumbnailer: got 0 handle (Error or Ready)\n");
      return;
    }

  _thumbnailer_lock (thumbnailer);

  /* look for the job so we don't emit unknown handles, the reason