Merge lp:~3v1n0/unity/fix-load-icon-crash-926658-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

ResultRendererTile: fix a crash if row.renderer<TextureContainer*>() is null

backported branch lp:~3v1n0/unity/fix-load-icon-crash-926658 to unity-5.0

[Michal Hruby (mhr3)]

Same as https://code.launchpad.net/~3v1n0/unity/fix-load-icon-crash-926658/+merge/116091 this is not a proper fix for the issue.

Moreover glib::Object::IsType isn't available in 5.0.

[Michal Hruby (mhr3)]

review: Needs Fixing

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2012-04-25 12:09:59 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2013-01-30 19:02:21 +0000
@@ -21,14 +21,10 @@
  */
 
 
-#include <sstream>     // for ostringstream
 #include "ResultRendererTile.h"
 
-#include <boost/algorithm/string.hpp>
-
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <NuxCore/Logger.h>
@@ -51,6 +47,7 @@
 namespace
 {
 nux::logging::Logger logger("unity.dash.results");
+const std::string DEFAULT_GICON = ". GThemedIcon text-x-preview";
 
 const int FONT_SIZE = 10;
 }
@@ -230,7 +227,7 @@
 
 void ResultRendererTile::Preload(Result& row)
 {
-  if (row.renderer<TextureContainer*>() == nullptr)
+  if (!row.renderer<TextureContainer*>())
   {
     row.set_renderer(new TextureContainer());
     LoadIcon(row);
@@ -240,17 +237,25 @@
 
 void ResultRendererTile::Unload(Result& row)
 {
-  TextureContainer *container = row.renderer<TextureContainer*>();
-  delete container;
+  delete row.renderer<TextureContainer*>();
   row.set_renderer<TextureContainer*>(nullptr);
 }
 
 void ResultRendererTile::LoadIcon(Result& row)
 {
+  auto container = row.renderer<TextureContainer*>();
+
+  if (!container)
+  {
+    LOG_ERROR(logger) << "No valid container for Result " << row.name() << " with URI "
+                      << row.uri();
+    return;
+  }
+
   Style& style = Style::Instance();
   std::string const& icon_hint = row.icon_hint;
-#define DEFAULT_GICON ". GThemedIcon text-x-preview"
   std::string icon_name;
+
   if (G_UNLIKELY(neko))
   {
     int tmp1 = style.GetTileIconSize() + (rand() % 16) - 8;
@@ -266,28 +271,25 @@
     icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON;
   }
 
-
-
-  GIcon*  icon = g_icon_new_for_string(icon_name.c_str(), NULL);
-  TextureContainer* container = row.renderer<TextureContainer*>();
-
-  IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
-
-  if (g_strrstr(icon_name.c_str(), "://"))
+  auto slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
+
+  if (icon_name.find("://") != std::string::npos)
   {
     container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name, style.GetTileIconSize(), slot);
   }
-  else if (G_IS_ICON(icon))
-  {
-    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, style.GetTileIconSize(), slot);
-  }
   else
   {
-    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, style.GetTileIconSize(), slot);
+    glib::Object<GIcon> icon(g_icon_new_for_string(icon_name.c_str(), nullptr));
+
+    if (G_IS_ICON(icon.RawPtr()))
+    {
+      container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, style.GetTileIconSize(), slot);
+    }
+    else
+    {
+      container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, style.GetTileIconSize(), slot);
+    }
   }
-
-  if (icon != NULL)
-    g_object_unref(icon);
 }
 
 nux::BaseTexture* ResultRendererTile::CreateTextureCallback(std::string const& texid,

=== modified file 'tests/test_service_lens.c'
--- tests/test_service_lens.c	2011-12-08 08:48:10 +0000
+++ tests/test_service_lens.c	2013-01-30 19:02:21 +0000
@@ -8,7 +8,6 @@
 static void add_filters(ServiceLens *self);
 static void on_search_changed(UnityScope* scope, UnityLensSearch *lens_search, UnitySearchType search_type, GCancellable *canc, ServiceLens* self);
 static UnityActivationResponse* on_activate_uri(UnityScope* scope, const char* uri, ServiceLens* self);
-static UnityPreview* on_preview_uri(UnityScope* scope, const char* uri, ServiceLens *self);
 
 struct _ServiceLensPrivate
 {
@@ -59,8 +58,6 @@
                    G_CALLBACK(on_search_changed), self);
   g_signal_connect(priv->scope, "activate-uri",
                    G_CALLBACK(on_activate_uri), self);
-  g_signal_connect(priv->scope, "preview-uri",
-                   G_CALLBACK(on_preview_uri), self);
 
   /* Get ready to export and export */
   unity_lens_add_local_scope(priv->lens, priv->scope);
@@ -183,18 +180,6 @@
   return unity_activation_response_new(UNITY_HANDLED_TYPE_HIDE_DASH, "");
 }
 
-static UnityPreview*
-on_preview_uri(UnityScope* scope, const char* uri, ServiceLens *self)
-{
-  gchar *genres[] = {"awesome"};
-  return (UnityPreview*)unity_track_preview_new(1, "Animus Vox",
-                                                "The Glitch Mob", "Drink The Sea", 
-                                                404, genres, 1,
-                                                "file://music/the/track", "Play",
-                                                "", "play://music/the/track",
-                                                "preview://music/the/track", "pause://music/the/track");
-}
-
 ServiceLens*
 service_lens_new()
 {