projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e4b5104
)
Don't assert too much
author
Matthias Clasen
<mclasen@redhat.com>
Sun, 1 Aug 2010 06:07:50 +0000
(
02:07
-0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Tue, 3 Aug 2010 14:25:54 +0000
(10:25 -0400)
glib/gbookmarkfile.c
patch
|
blob
|
history
diff --git
a/glib/gbookmarkfile.c
b/glib/gbookmarkfile.c
index
9501fd5
..
db2a8bc
100644
(file)
--- 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)