Fix memleak in log_store_empathy_get_chats_for_dir. Only build filename if its

[empathy.git] / libempathy / empathy-log-store-empathy.c

diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 15a0b2e51a7d8b5479b03333313af26d78fe72c7..37a76676f5c84e948cc25f5f7884c9ee41edb11c 100644 (file)
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -505,6 +505,7 @@ log_store_empathy_get_messages_for_file (EmpathyLogStore *self,
       xmlFree (is_user_str);
       xmlFree (msg_type_str);
       xmlFree (cm_id_str);
+      xmlFree (sender_avatar_token);
     }
 
   DEBUG ("Parsed %d messages", g_list_length (messages));
@@ -627,25 +628,28 @@ log_store_empathy_get_chats_for_dir (EmpathyLogStore *self,
   GDir *gdir;
   GList *hits = NULL;
   const gchar *name;
+  GError *error = NULL;
 
-  gdir = g_dir_open (dir, 0, NULL);
+  gdir = g_dir_open (dir, 0, &error);
   if (!gdir)
-    return NULL;
+    {
+      DEBUG ("Failed to open directory: %s, error: %s", dir, error->message);
+      g_error_free (error);
+      return NULL;
+    }
 
   while ((name = g_dir_read_name (gdir)) != NULL)
     {
       EmpathyLogSearchHit *hit;
-      gchar *filename;
 
-      filename = g_build_filename (dir, name, NULL);
-      if (strcmp (name, LOG_DIR_CHATROOMS) == 0)
+      if (!is_chatroom && strcmp (name, LOG_DIR_CHATROOMS) == 0)
         {
+          gchar *filename = g_build_filename (dir, name, NULL);
           hits = g_list_concat (hits, log_store_empathy_get_chats_for_dir (
-                self, dir, TRUE));
+                self, filename, TRUE));
           g_free (filename);
           continue;
         }
-
       hit = g_slice_new0 (EmpathyLogSearchHit);
       hit->chat_id = g_strdup (name);
       hit->is_chatroom = is_chatroom;