* src/itdb_itunesdb.c: change g_assert to g_return_if_fail (don't

	  terminate the application just because the iTunesDB was
	  manipulated).

	* src/db-artwork-parser.c: change g_assert to g_return_if_fail
	  (don't terminate the application just because the ArtworkDB was
	  manipulated).

	* src/itdb_artwork.c: change g_assert to g_return_if_fail
	  (don't terminate the application just because the ithmb file was
	  manipulated).

There's a number of g_asserts left in db-parse-context.c which don't catch programming errors but input errors.


git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1188 f01d2545-417e-4e96-918e-98f8d0dbbcb6

4 files changed, 21 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index d6a68cc..5ea2cc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-12-06  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/itdb_itunesdb.c: change g_assert to g_return_if_fail (don't
+	  terminate the application just because the iTunesDB was
+	  manipulated).
+
+	* src/db-artwork-parser.c: change g_assert to g_return_if_fail
+	  (don't terminate the application just because the ArtworkDB was
+	  manipulated).
+
+	* src/itdb_artwork.c: change g_assert to g_return_if_fail
+	  (don't terminate the application just because the ithmb file was
+	  manipulated).
+	
 2005-12-05  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
 	* src/db-artwork-writer/parser.c: Create ArtworkDB when it does
diff --git a/src/db-artwork-parser.c b/src/db-artwork-parser.c
index 5a9254e..8731050 100644
--- a/src/db-artwork-parser.c
+++ b/src/db-artwork-parser.c
@@ -401,7 +401,7 @@ parse_mhfd (DBParseContext *ctx, Itdb_iTunesDB *db, GError **error)
 	}
 
 	/* Sanity check */
-	g_assert (GINT_FROM_LE (mhfd->total_len) == ctx->total_len);
+	g_return_val_if_fail (GINT_FROM_LE (mhfd->total_len) == ctx->total_len, -1);
 	dump_mhfd (mhfd);
 	cur_pos = ctx->header_len;
 
diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c
index e5c5cbf..53a19f7 100644
--- a/src/itdb_artwork.c
+++ b/src/itdb_artwork.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-04 15:56:23 jcs>
+/* Time-stamp: <2005-12-06 22:20:39 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -219,7 +219,7 @@ unpack_RGB_565 (guint16 *pixels, guint bytes_len)
 	guchar *result;
 	guint i;
 
-	g_assert (bytes_len < 2*(G_MAXUINT/3));
+	g_return_val_if_fail (bytes_len < 2*(G_MAXUINT/3), NULL);
 	result = g_malloc ((bytes_len/2) * 3);
 	if (result == NULL) {
 		return NULL;
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index 82c68ea..cab4d8e 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-04 19:10:42 jcs>
+/* Time-stamp: <2005-12-06 22:20:40 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -1020,7 +1020,7 @@ static MHODData get_mhod (FContents *cts, glong mhod_seek, guint32 *ml)
   case MHOD_ID_SUBTITLE:
       xl = get32lint (cts, seek+4);   /* length of string */
       if (cts->error) return result;  /* *ml==-1, result.valid==FALSE */
-      g_assert (xl < G_MAXUINT - 2);
+      g_return_val_if_fail (xl < G_MAXUINT - 2, result);
       entry_utf16 = g_new0 (gunichar2, (xl+2)/2);
       if (seek_get_n_bytes (cts, (gchar *)entry_utf16, seek+16, xl))
       {
@@ -1040,7 +1040,7 @@ static MHODData get_mhod (FContents *cts, glong mhod_seek, guint32 *ml)
       /* length of string */
       xl = mhod_len - header_length;
       if (cts->error) return result;  /* *ml==-1, result.valid==FALSE */
-      g_assert (xl < G_MAXUINT - 1);
+      g_return_val_if_fail (xl < G_MAXUINT - 1, result);
       result.data.string = g_new0 (gchar, xl+1);
       if (!seek_get_n_bytes (cts, result.data.string, seek, xl))
       {
@@ -1102,7 +1102,7 @@ static MHODData get_mhod (FContents *cts, glong mhod_seek, guint32 *ml)
 	      splr->action = get32bint (cts, seek+4);
 	      seek += 52;
 	      length = get32bint (cts, seek);
-	      g_assert (length < G_MAXUINT-2);
+	      g_return_val_if_fail (length < G_MAXUINT-2, result);
 	      if (itdb_spl_action_known (splr->action))
 	      {
 		  gint ft = itdb_splr_get_field_type (splr);