[tracker/binary-log-2: 36/38] libtracker-db: Fix error handling in reader initialization

[Jürg Billeter <juergbi src gnome org>]

commit d661ed1b63fa33c0a7fcce62879f6b933754db24
Author: Jürg Billeter <j bitron ch>
Date:   Tue Jan 12 16:00:10 2010 +0100

    libtracker-db: Fix error handling in reader initialization

 src/libtracker-db/tracker-db-journal.c |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/src/libtracker-db/tracker-db-journal.c b/src/libtracker-db/tracker-db-journal.c
index 35a543c..5920fe1 100644
--- a/src/libtracker-db/tracker-db-journal.c
+++ b/src/libtracker-db/tracker-db-journal.c
@@ -593,16 +593,15 @@ tracker_db_journal_reader_init (const gchar *filename)
 	reader.end = reader.current + g_mapped_file_get_length (reader.file);
 
 	/* verify journal file header */
-	g_assert (reader.end - reader.current >= 8);
-
-	g_assert_cmpint (reader.current[0], ==, 't');
-	g_assert_cmpint (reader.current[1], ==, 'r');
-	g_assert_cmpint (reader.current[2], ==, 'l');
-	g_assert_cmpint (reader.current[3], ==, 'o');
-	g_assert_cmpint (reader.current[4], ==, 'g');
-	g_assert_cmpint (reader.current[5], ==, '\0');
-	g_assert_cmpint (reader.current[6], ==, '0');
-	g_assert_cmpint (reader.current[7], ==, '1');
+	if (reader.end - reader.current < 8) {
+		tracker_db_journal_reader_shutdown ();
+		return FALSE;
+	}
+
+	if (memcmp (reader.current, "trlog\00001", 8)) {
+		tracker_db_journal_reader_shutdown ();
+		return FALSE;
+	}
 
 	reader.current += 8;