From 9b96e31968383619ff0a76212c5200022d62b23c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 1 Aug 2010 02:07:50 -0400 Subject: [PATCH] Don't assert too much --- glib/gbookmarkfile.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c index 9501fd579..db2a8bcb1 100644 --- a/glib/gbookmarkfile.c +++ b/glib/gbookmarkfile.c @@ -1693,9 +1693,7 @@ g_bookmark_file_load_from_data (GBookmarkFile *bookmark, gboolean retval; g_return_val_if_fail (bookmark != NULL, FALSE); - g_return_val_if_fail (data != NULL, FALSE); - g_return_val_if_fail (length != 0, FALSE); - + if (length == (gsize) -1) length = strlen (data); @@ -1704,7 +1702,7 @@ g_bookmark_file_load_from_data (GBookmarkFile *bookmark, g_bookmark_file_clear (bookmark); g_bookmark_file_init (bookmark); } - + parse_error = NULL; retval = g_bookmark_file_parse (bookmark, data, length, &parse_error); if (!retval)