summaryrefslogtreecommitdiff
path: root/riscos/hotlist.c
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2004-07-25 22:47:54 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2004-07-25 22:47:54 +0000
commitb0fa41bb1175fe40235cfb627d08556be3141046 (patch)
treeb74af3048da547ebe05a65d4cc8b7b24253544b4 /riscos/hotlist.c
parent9ff81cb0ee66b75bb7a067df1f3b170e6f2fa3c0 (diff)
downloadnetsurf-b0fa41bb1175fe40235cfb627d08556be3141046.tar.gz
netsurf-b0fa41bb1175fe40235cfb627d08556be3141046.tar.bz2
[project @ 2004-07-25 22:47:54 by rjw]
Fix for fix for broken hotlist loading. Removed debug comments from mng.c svn path=/import/netsurf/; revision=1148
Diffstat (limited to 'riscos/hotlist.c')
-rw-r--r--riscos/hotlist.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index 9c82249df..944cd70be 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -464,11 +464,11 @@ void ro_gui_hotlist_load_entry(xmlNode *cur, struct hotlist_entry *entry, bool a
int visits = 0;
bool add_entry;
- while (cur) {
+ while (true) {
/* Add any items that have had all the data they can have
*/
if ((allow_add) && (load_title != NULL)) {
- if ((cur->next == NULL) || ((cur->type == XML_ELEMENT_NODE) &&
+ if ((cur == NULL) || ((cur->type == XML_ELEMENT_NODE) &&
((!(strcmp(cur->name, "li"))) || (!(strcmp(cur->name, "h4"))) ||
(!(strcmp(cur->name, "ul")))))) {
@@ -494,6 +494,10 @@ void ro_gui_hotlist_load_entry(xmlNode *cur, struct hotlist_entry *entry, bool a
visits = 0;
}
}
+
+ /* Abort if we've ran out of content
+ */
+ if (cur == NULL) return;
/* Gather further information and recurse
*/