From 74aefa193695d7b6333703ec8539d05022c866a3 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 26 Feb 2005 22:30:20 +0000 Subject: Make sure folder is != NULL. Fixes bug #163341. 2005-02-26 Christian Persch * src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_folder): Make sure folder is != NULL. Fixes bug #163341. --- src/bookmarks/ephy-bookmarks-import.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c index 23aa493ce..47cf97f34 100644 --- a/src/bookmarks/ephy-bookmarks-import.c +++ b/src/bookmarks/ephy-bookmarks-import.c @@ -313,9 +313,9 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold ret = xbel_parse_bookmark (eb, reader, &node); - keyword = ephy_bookmarks_find_keyword (eb, folder, FALSE); + keyword = ephy_bookmarks_find_keyword (eb, folder ? folder : "", FALSE); - if (keyword == NULL) + if (keyword == NULL && folder != NULL && folder[0] != '\0') { keyword = ephy_bookmarks_add_keyword (eb, folder); } @@ -332,7 +332,7 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold { if (type == XML_READER_TYPE_ELEMENT) { - ret = xbel_parse_folder (eb, reader, folder); + ret = xbel_parse_folder (eb, reader, folder ? folder : ""); if (ret != 1) break; } -- cgit v1.2.3