mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-28 14:59:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure hotlist URLs are normalised before using them.

Browse Source 
Squash a bunch of memory leaks.

svn path=/trunk/netsurf/; revision=6370
This commit is contained in:
John Mark Bell 2009-02-06 02:04:25 +00:00
parent d76712a150
commit 961be4593b
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
desktop/options.c
View File

@ -39,6 +39,7 @@
#include "desktop/tree.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/url.h"
#include "utils/utils.h"
#if defined(riscos)
@ -458,7 +459,12 @@ struct tree *options_load_tree(const char *filename) {
return NULL;
}
tree->root = tree_create_folder_node(NULL, "Root");
if (!tree->root) return NULL;
if (!tree->root) {
free(tree);
xmlFreeDoc(doc);
return NULL;
}
options_load_tree_directory(ul, tree->root);
tree->root->expanded = true;
@ -517,8 +523,11 @@ void options_load_tree_directory(xmlNode *ul, struct node *directory) {
}
dir = tree_create_folder_node(directory, title);
if (!dir)
if (!dir) {
free(title);
return;
}
options_load_tree_directory(n, dir);
}
}
@ -532,27 +541,47 @@ void options_load_tree_directory(xmlNode *ul, struct node *directory) {
* \param directory directory to add this entry to
*/
void options_load_tree_entry(xmlNode *li, struct node *directory) {
char *url = 0;
char *title = 0;
char *url = NULL, *url1 = NULL;
char *title = NULL;
struct node *entry;
xmlNode *n;
const struct url_data *data;
url_func_result res;
for (n = li->children; n; n = n->next) {
/* The li must contain an "a" element */
if (n->type == XML_ELEMENT_NODE &&
strcmp((const char *) n->name, "a") == 0) {
url = (char *) xmlGetProp(n, (const xmlChar *) "href");
url1 = (char *) xmlGetProp(n, (const xmlChar *) "href");
title = (char *) xmlNodeGetContent(n);
}
}
if (!url || !title) {
if (!url1 || !title) {
warn_user("HotlistLoadError", "(Missing <a> in <li> or "
"memory exhausted.)");
return;
}
/* We're loading external input.
* This may be garbage, so attempt to normalise
*/
res = url_normalize(url1, &url);
if (res != URL_FUNC_OK) {
LOG(("Failed normalising '%s'", url1));
if (res == URL_FUNC_NOMEM)
warn_user("NoMemory", NULL);
xmlFree(url1);
xmlFree(title);
return;
}
/* No longer need this */
xmlFree(url1);
data = urldb_get_url_data(url);
if (!data) {
/* No entry in database, so add one */
@ -560,8 +589,12 @@ void options_load_tree_entry(xmlNode *li, struct node *directory) {
/* now attempt to get url data */
data = urldb_get_url_data(url);
}
if (!data)
if (!data) {
xmlFree(title);
free(url);
return;
}
/* Make this URL persistent */
urldb_set_url_persistence(url, true);
@ -570,8 +603,9 @@ void options_load_tree_entry(xmlNode *li, struct node *directory) {
urldb_set_url_title(url, title);
entry = tree_create_URL_node(directory, url, data, title);
xmlFree(url);
xmlFree(title);
free(url);
}