From 192e417d83eb7b793803172835b89bd69507b7c9 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:08 +0100 Subject: [PATCH 1/8] In feed_parse(), move a NULL pointer check before the pointer dereference. --- src/feed_parser.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/feed_parser.c b/src/feed_parser.c index bd08dba..ffbdad3 100644 --- a/src/feed_parser.c +++ b/src/feed_parser.c @@ -176,14 +176,14 @@ feed_parse (feedParserCtxtPtr ctxt) cur = cur->next; } + if(!cur) + break; + if(!cur->name) { g_string_append(ctxt->feed->parseErrors, _("Invalid XML!")); break; } - if(!cur) - break; - /* determine the syndication format and start parser */ GSList *handlerIter = feed_parsers_get_list (); while(handlerIter) { -- 1.6.5.6 From 67fd381539dc67c87840e406438fc88a721df162 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:09 +0100 Subject: [PATCH 2/8] Add a NULL pointer check in migrate_load_from_cache(). --- src/migrate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/migrate.c b/src/migrate.c index edcab30..17b8d63 100644 --- a/src/migrate.c +++ b/src/migrate.c @@ -191,7 +191,7 @@ migrate_load_from_cache (const gchar *sourceDir, const gchar *id) while (cur && xmlIsBlankNode (cur)) cur = cur->next; - if (!xmlStrcmp (cur->name, BAD_CAST"feed")) { + if (cur && !xmlStrcmp (cur->name, BAD_CAST"feed")) { xmlChar *version; if ((version = xmlGetProp (cur, BAD_CAST"version"))) { migrateFrom10 = xmlStrcmp (BAD_CAST FEED_CACHE_VERSION, version); -- 1.6.5.6 From 0eff69122c6c523a2c97a8083be71a7e8ffd6b7e Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:09 +0100 Subject: [PATCH 3/8] Remove write-only variable list2 in metadata_list_copy(). --- src/metadata.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/metadata.c b/src/metadata.c index 2414e1c..49e9022 100644 --- a/src/metadata.c +++ b/src/metadata.c @@ -261,12 +261,12 @@ const gchar * metadata_list_get(GSList *metadata, const gchar *strid) { GSList * metadata_list_copy(GSList *list) { GSList *copy = NULL; - GSList *list2, *iter2, *iter = list; + GSList *iter2, *iter = list; struct pair *p; while(iter) { p = (struct pair*)iter->data; - iter2 = list2 = p->data; + iter2 = p->data; while(iter2) { copy = metadata_list_append(copy, p->strid, iter2->data); iter2 = iter2->next; -- 1.6.5.6 From 1f60a589b82d196b1472d2753ecde03a37671db3 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:09 +0100 Subject: [PATCH 4/8] Remove an apparently pointless xmlDocGetRootElement() call in script_config_save(). --- src/script.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/script.c b/src/script.c index e31e227..ea94847 100644 --- a/src/script.c +++ b/src/script.c @@ -156,7 +156,6 @@ static void script_config_save(void) { return; doc = xmlNewDoc("1.0"); - rootNode = xmlDocGetRootElement(doc); rootNode = xmlNewDocNode(doc, NULL, "scripts", NULL); xmlDocSetRootElement(doc, rootNode); -- 1.6.5.6 From 141d088d3bd7dc68681ea3e9d96e5b4aea64719f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:09 +0100 Subject: [PATCH 5/8] Remove an apparently pointless xmlDocGetRootElement() call in node_to_xml(). --- src/node.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/node.c b/src/node.c index 706f199..600f4df 100644 --- a/src/node.c +++ b/src/node.c @@ -320,7 +320,6 @@ static xmlDocPtr node_to_xml(nodePtr node) { gchar *tmp; doc = xmlNewDoc("1.0"); - rootNode = xmlDocGetRootElement(doc); rootNode = xmlNewDocNode(doc, NULL, "node", NULL); xmlDocSetRootElement(doc, rootNode); -- 1.6.5.6 From 516920ef2055b018e8718df12c98cfa9d13838a4 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:09 +0100 Subject: [PATCH 6/8] Remove an apparently pointless xmlDocGetRootElement() call in feed_to_xml(). --- src/feed.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/feed.c b/src/feed.c index e099282..1c068e5 100644 --- a/src/feed.c +++ b/src/feed.c @@ -217,7 +217,6 @@ feed_to_xml (nodePtr node, xmlNodePtr feedNode) if (!feedNode) { doc = xmlNewDoc ("1.0"); - feedNode = xmlDocGetRootElement (doc); feedNode = xmlNewDocNode (doc, NULL, "feed", NULL); xmlDocSetRootElement (doc, feedNode); } -- 1.6.5.6 From 30be398398be4b61813b98492898bfc0c6f37652 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:09 +0100 Subject: [PATCH 7/8] Fix spelling in comment. --- src/parsers/atom10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/parsers/atom10.c b/src/parsers/atom10.c index 5381511..5a3fb29 100644 --- a/src/parsers/atom10.c +++ b/src/parsers/atom10.c @@ -253,7 +253,7 @@ atom10_parse_person_construct (xmlNodePtr cur) invalid = TRUE; name = g_strdup (_("Invalid Atom feed: unknown author")); } - /* FIXME: so somthing with "invalid" flag */ + /* FIXME: do something with "invalid" flag */ tmp = g_strdup_printf ("%s%s%s", name, uri?uri:"", email?email:""); g_free (uri); g_free (email); -- 1.6.5.6 From 6f7f54e997cd304afe6b182ab913381936b4be77 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 13 Dec 2009 17:12:09 +0100 Subject: [PATCH 8/8] Fix dead store in liferea_htmlview_handle_URL(). --- src/ui/liferea_htmlview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/ui/liferea_htmlview.c b/src/ui/liferea_htmlview.c index 8e0a19d..5c18307 100644 --- a/src/ui/liferea_htmlview.c +++ b/src/ui/liferea_htmlview.c @@ -340,7 +340,6 @@ liferea_htmlview_handle_URL (LifereaHtmlView *htmlview, const gchar *url) nodeid = strstr (url, "://"); if (nodeid) { nodeid += 3; - itemnr = nodeid; itemnr = strchr (nodeid, '-'); if (itemnr) { itemPtr item; -- 1.6.5.6