From f8131917e2ea9ee8cd9aa5982394128635c01adf Mon Sep 17 00:00:00 2001
From: teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6>
Date: Sun, 25 May 2008 11:28:39 +0000
Subject: * src/itdb_device.c: don't insert NULL firewire IDs in the SysInfo
 hash table

git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1983 f01d2545-417e-4e96-918e-98f8d0dbbcb6
---
 ChangeLog         | 5 +++++
 src/itdb_device.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92ed3a2..5c0a3aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-25  Christophe Fergeau <teuf at gnome.org>
+
+	* src/itdb_device.c: don't insert NULL firewire IDs in the SysInfo
+	hash table
+
 2008-05-25  Christophe Fergeau <teuf at gnome.org>
 
 	* configure.ac: rework libxml detection
diff --git a/src/itdb_device.c b/src/itdb_device.c
index 4f3fe50..0f86c57 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -452,8 +452,10 @@ static void itdb_device_read_sysinfo_extended (Itdb_Device *device)
     if ((device->sysinfo != NULL) && (device->sysinfo_extended != NULL)) {
         const char *fwid;
         fwid = itdb_sysinfo_properties_get_firewire_id (device->sysinfo_extended);
-        g_hash_table_insert (device->sysinfo, g_strdup ("FirewireGuid"),
-                             g_strdup (fwid));
+        if (fwid != NULL) {
+            g_hash_table_insert (device->sysinfo, g_strdup ("FirewireGuid"),
+                                 g_strdup (fwid));
+        }
     }
 }
 
-- 
cgit