commit 1c6d4008be81c73b0eec47e9a10e208ece51ca81
Author: Hector Martin <[email protected]>
Date:   Tue Oct 20 00:16:25 2009 +0200

    Fix another nullderef

 src/itdb_sqlite.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/itdb_sqlite.c b/src/itdb_sqlite.c
index 2d96bb3..2d0ffa1 100644
--- a/src/itdb_sqlite.c
+++ b/src/itdb_sqlite.c
@@ -1317,7 +1317,6 @@ int itdb_sqlite_generate_itdbs(FExport *fexp)
     int res = 0;
     gchar *itlpdir;
     gchar *dirname;
-    Itdb_iTunesDB *itdb = NULL;
 
     printf("libitdbprep: %s called with file %s and uuid %s\n", __func__,
           fexp->itdb->filename, itdb_device_get_uuid(fexp->itdb->device));
@@ -1338,10 +1337,10 @@ int itdb_sqlite_generate_itdbs(FExport *fexp)
     g_assert(fexp->itdb != NULL);
     g_assert(fexp->itdb->playlists != NULL);
 
-    tzoffset = itdb->tzoffset;
+    tzoffset = fexp->itdb->tzoffset;
 
     /* generate itdb files */
-    build_itdb_files(itdb, fexp->albums, fexp->artists, itlpdir,
+    build_itdb_files(fexp->itdb, fexp->albums, fexp->artists, itlpdir,
                     itdb_device_get_uuid(fexp->itdb->device));
 
 leave:

------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to