libgpod/trunk/0001-323-Segmentation-fault-when-opening-ipod.patch

   1 From 8dc5015ae036b219c4c9579a156886aa3a722aa5 Mon Sep 17 00:00:00 2001
   2 From: phantomjinx <p.g.richardson@phantomjinx.co.uk>
   3 Date: Sat, 9 Aug 2014 19:57:10 +0100
   4 Subject: [PATCH] #323 Segmentation fault when opening ipod
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 * Patch submitted in bug report from François Melchior / James Burton
  10 ---
  11  src/itdb_itunesdb.c | 6 ++++--
  12  1 file changed, 4 insertions(+), 2 deletions(-)
  13
  14 diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
  15 index 4cc771a..1e85476 100644
  16 --- a/src/itdb_itunesdb.c
  17 +++ b/src/itdb_itunesdb.c
  18 @@ -1156,6 +1156,7 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
  19      GHashTable *pc_dict, *track_dict;
  20      GValue *to_parse;
  21      GArray *array;
  22 +    GValue value;
  23      gint i;
  24      guint32 mac_time;
  25      guint64 *dbid;
  26 @@ -1175,11 +1176,12 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
  27
  28      array = (GArray*)g_value_get_boxed (to_parse);
  29      for (i = 0; i < array->len; i++) {
  30 -       if (!G_VALUE_HOLDS (g_array_index (array, GValue *, i), G_TYPE_HASH_TABLE)) {
  31 +       value = g_array_index (array, GValue, i);
  32 +       if (!G_VALUE_HOLDS (&value, G_TYPE_HASH_TABLE)) {
  33            continue;
  34         }
  35
  36 -       track_dict = g_value_get_boxed (g_array_index (array, GValue *, i));
  37 +       track_dict = g_value_get_boxed (&value);
  38         if (track_dict == NULL)
  39             continue;
  40
  41 --
  42 2.12.2
  43