netsurf: branch master updated. release/3.0-655-g9ea65f6
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9ea65f652a4526d4dfa69...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9ea65f652a4526d4dfa69f7...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9ea65f652a4526d4dfa69f79f...
The branch, master has been updated
via 9ea65f652a4526d4dfa69f79fbe14f1c196d3cd4 (commit)
from 3dc4ba29890f7471884b76795e8e1a88353d756a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9ea65f652a4526d4dfa...
commit 9ea65f652a4526d4dfa69f79fbe14f1c196d3cd4
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix Coverity #1109871.
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 28c0f60..f812090 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -195,8 +195,9 @@ void fetch_curl_register(void)
SETOPT(CURLOPT_VERBOSE, 0);
}
SETOPT(CURLOPT_ERRORBUFFER, fetch_error_buffer);
- if (nsoption_bool(suppress_curl_debug))
+ if (nsoption_bool(suppress_curl_debug)) {
SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug);
+ }
SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data);
SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header);
SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress);
-----------------------------------------------------------------------
Summary of changes:
content/fetchers/curl.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 28c0f60..f812090 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -195,8 +195,9 @@ void fetch_curl_register(void)
SETOPT(CURLOPT_VERBOSE, 0);
}
SETOPT(CURLOPT_ERRORBUFFER, fetch_error_buffer);
- if (nsoption_bool(suppress_curl_debug))
+ if (nsoption_bool(suppress_curl_debug)) {
SETOPT(CURLOPT_DEBUGFUNCTION, fetch_curl_ignore_debug);
+ }
SETOPT(CURLOPT_WRITEFUNCTION, fetch_curl_data);
SETOPT(CURLOPT_HEADERFUNCTION, fetch_curl_header);
SETOPT(CURLOPT_PROGRESSFUNCTION, fetch_curl_progress);
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-654-g3dc4ba2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/3dc4ba29890f7471884b7...
...commit http://git.netsurf-browser.org/netsurf.git/commit/3dc4ba29890f7471884b767...
...tree http://git.netsurf-browser.org/netsurf.git/tree/3dc4ba29890f7471884b76795...
The branch, master has been updated
via 3dc4ba29890f7471884b76795e8e1a88353d756a (commit)
from e37fb89f4610a2a4dbc3551900e7cae4c9b00baf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3dc4ba29890f7471884...
commit 3dc4ba29890f7471884b76795e8e1a88353d756a
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Remove unrequired NULL check.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index f286a0e..fed8a48 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -232,7 +232,7 @@ static inline treeview_node * treeview_node_next(treeview_node *node, bool full)
if (node->type == TREE_NODE_ROOT) {
node = NULL;
- } else if (node != NULL) {
+ } else {
node = node->next_sib;
}
}
-----------------------------------------------------------------------
Summary of changes:
desktop/treeview.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/desktop/treeview.c b/desktop/treeview.c
index f286a0e..fed8a48 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -232,7 +232,7 @@ static inline treeview_node * treeview_node_next(treeview_node *node, bool full)
if (node->type == TREE_NODE_ROOT) {
node = NULL;
- } else if (node != NULL) {
+ } else {
node = node->next_sib;
}
}
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-653-ge37fb89
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e37fb89f4610a2a4dbc35...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e37fb89f4610a2a4dbc3551...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e37fb89f4610a2a4dbc355190...
The branch, master has been updated
via e37fb89f4610a2a4dbc3551900e7cae4c9b00baf (commit)
from 776d0b90a15bd425e14db99bb64471d53cb529c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e37fb89f4610a2a4dbc...
commit e37fb89f4610a2a4dbc3551900e7cae4c9b00baf
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Remove unreachable code.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 8bf4923..f286a0e 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -2790,11 +2790,7 @@ static bool treeview_set_move_indicator(treeview *tree, bool need_redraw,
node_y += (tree_g.line_height -
treeview_res[TREE_RES_ARROW].height + 1) / 2;
- if (target != NULL) {
- x = target->inset + tree_g.move_offset;
- } else {
- x = tree->root->children->inset;
- }
+ x = target->inset + tree_g.move_offset;
/* Update target details */
tree->move.target = target;
-----------------------------------------------------------------------
Summary of changes:
desktop/treeview.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 8bf4923..f286a0e 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -2790,11 +2790,7 @@ static bool treeview_set_move_indicator(treeview *tree, bool need_redraw,
node_y += (tree_g.line_height -
treeview_res[TREE_RES_ARROW].height + 1) / 2;
- if (target != NULL) {
- x = target->inset + tree_g.move_offset;
- } else {
- x = tree->root->children->inset;
- }
+ x = target->inset + tree_g.move_offset;
/* Update target details */
tree->move.target = target;
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-652-g776d0b9
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/776d0b90a15bd425e14db...
...commit http://git.netsurf-browser.org/netsurf.git/commit/776d0b90a15bd425e14db99...
...tree http://git.netsurf-browser.org/netsurf.git/tree/776d0b90a15bd425e14db99bb...
The branch, master has been updated
via 776d0b90a15bd425e14db99bb64471d53cb529c6 (commit)
via 8cb2d52483adf1f1291d4e6e86c8525bf6f7e790 (commit)
from 53a6d6becd2aa16a6e087d626bb070f5fbae235e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=776d0b90a15bd425e14...
commit 776d0b90a15bd425e14db99bb64471d53cb529c6
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
improve comment to indicate what API is for
diff --git a/content/urldb.h b/content/urldb.h
index 9c88903..6a29465 100644
--- a/content/urldb.h
+++ b/content/urldb.h
@@ -75,10 +75,7 @@ void urldb_set_url_persistence(nsurl *url, bool persist);
/* URL insertion */
bool urldb_add_url(nsurl *url);
-struct host_part *urldb_add_host(const char *host);
-struct path_data *urldb_add_path(lwc_string *scheme, unsigned int port,
- const struct host_part *host, char *path_query,
- lwc_string *fragment, nsurl *url);
+
/* URL data modification / lookup */
void urldb_set_url_title(nsurl *url, const char *title);
@@ -121,4 +118,11 @@ void urldb_delete_cookie(const char *domain, const char *path, const char *name)
void urldb_load_cookies(const char *filename);
void urldb_save_cookies(const char *filename);
+
+/* test harness only */
+struct host_part *urldb_add_host(const char *host);
+struct path_data *urldb_add_path(lwc_string *scheme, unsigned int port,
+ const struct host_part *host, char *path_query,
+ lwc_string *fragment, nsurl *url);
+
#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=8cb2d52483adf1f1291...
commit 8cb2d52483adf1f1291d4e6e86c8525bf6f7e790
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
fix coverity #1111069
diff --git a/desktop/browser.c b/desktop/browser.c
index 9999444..55f576a 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1226,12 +1226,13 @@ static nserror browser_window_callback(hlcache_handle *c,
browser_window_remove_caret(bw, false);
- if (bw->window)
+ if (bw->window != NULL) {
gui_window_new_content(bw->window);
- browser_window_refresh_url_bar(bw,
+ browser_window_refresh_url_bar(bw,
hlcache_handle_get_url(bw->current_content),
bw->frag_id);
+ }
/* new content; set scroll_to_top */
browser_window_update(bw, true);
-----------------------------------------------------------------------
Summary of changes:
content/urldb.h | 12 ++++++++----
desktop/browser.c | 5 +++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/content/urldb.h b/content/urldb.h
index 9c88903..6a29465 100644
--- a/content/urldb.h
+++ b/content/urldb.h
@@ -75,10 +75,7 @@ void urldb_set_url_persistence(nsurl *url, bool persist);
/* URL insertion */
bool urldb_add_url(nsurl *url);
-struct host_part *urldb_add_host(const char *host);
-struct path_data *urldb_add_path(lwc_string *scheme, unsigned int port,
- const struct host_part *host, char *path_query,
- lwc_string *fragment, nsurl *url);
+
/* URL data modification / lookup */
void urldb_set_url_title(nsurl *url, const char *title);
@@ -121,4 +118,11 @@ void urldb_delete_cookie(const char *domain, const char *path, const char *name)
void urldb_load_cookies(const char *filename);
void urldb_save_cookies(const char *filename);
+
+/* test harness only */
+struct host_part *urldb_add_host(const char *host);
+struct path_data *urldb_add_path(lwc_string *scheme, unsigned int port,
+ const struct host_part *host, char *path_query,
+ lwc_string *fragment, nsurl *url);
+
#endif
diff --git a/desktop/browser.c b/desktop/browser.c
index 9999444..55f576a 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1226,12 +1226,13 @@ static nserror browser_window_callback(hlcache_handle *c,
browser_window_remove_caret(bw, false);
- if (bw->window)
+ if (bw->window != NULL) {
gui_window_new_content(bw->window);
- browser_window_refresh_url_bar(bw,
+ browser_window_refresh_url_bar(bw,
hlcache_handle_get_url(bw->current_content),
bw->frag_id);
+ }
/* new content; set scroll_to_top */
browser_window_update(bw, true);
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-650-g53a6d6b
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/53a6d6becd2aa16a6e087...
...commit http://git.netsurf-browser.org/netsurf.git/commit/53a6d6becd2aa16a6e087d6...
...tree http://git.netsurf-browser.org/netsurf.git/tree/53a6d6becd2aa16a6e087d626...
The branch, master has been updated
via 53a6d6becd2aa16a6e087d626bb070f5fbae235e (commit)
from 0bbaf1d24d4b0b7a6944438e689a81d820be0f3d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=53a6d6becd2aa16a6e0...
commit 53a6d6becd2aa16a6e087d626bb070f5fbae235e
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Show "-" for last visit date/time when visits count is 0.
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 372ae5c..6671a77 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -82,18 +82,25 @@ static nserror hotlist_create_treeview_field_visits_data(
int len;
/* Last visited */
- last_visited = ctime(&data->last_visit);
- last_visited2 = strdup(last_visited);
+ if (data->visits != 0) {
+ last_visited = ctime(&data->last_visit);
+ last_visited2 = strdup(last_visited);
+ len = 24;
+ } else {
+ last_visited2 = strdup("-");
+ len = 1;
+ }
if (last_visited2 == NULL) {
return NSERROR_NOMEM;
- } else {
+
+ } else if (len == 24) {
assert(last_visited2[24] == '\n');
last_visited2[24] = '\0';
}
e->data[HL_LAST_VISIT].field = hl_ctx.fields[HL_LAST_VISIT].field;
e->data[HL_LAST_VISIT].value = last_visited2;
- e->data[HL_LAST_VISIT].value_len = 24;
+ e->data[HL_LAST_VISIT].value_len = len;
/* Visits */
len = snprintf(buffer, 16, "%u", data->visits);
-----------------------------------------------------------------------
Summary of changes:
desktop/hotlist.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 372ae5c..6671a77 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -82,18 +82,25 @@ static nserror hotlist_create_treeview_field_visits_data(
int len;
/* Last visited */
- last_visited = ctime(&data->last_visit);
- last_visited2 = strdup(last_visited);
+ if (data->visits != 0) {
+ last_visited = ctime(&data->last_visit);
+ last_visited2 = strdup(last_visited);
+ len = 24;
+ } else {
+ last_visited2 = strdup("-");
+ len = 1;
+ }
if (last_visited2 == NULL) {
return NSERROR_NOMEM;
- } else {
+
+ } else if (len == 24) {
assert(last_visited2[24] == '\n');
last_visited2[24] = '\0';
}
e->data[HL_LAST_VISIT].field = hl_ctx.fields[HL_LAST_VISIT].field;
e->data[HL_LAST_VISIT].value = last_visited2;
- e->data[HL_LAST_VISIT].value_len = 24;
+ e->data[HL_LAST_VISIT].value_len = len;
/* Visits */
len = snprintf(buffer, 16, "%u", data->visits);
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-649-g0bbaf1d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/0bbaf1d24d4b0b7a69444...
...commit http://git.netsurf-browser.org/netsurf.git/commit/0bbaf1d24d4b0b7a6944438...
...tree http://git.netsurf-browser.org/netsurf.git/tree/0bbaf1d24d4b0b7a6944438e6...
The branch, master has been updated
via 0bbaf1d24d4b0b7a6944438e689a81d820be0f3d (commit)
from 3e08819db94ae86f995e1e14650258c6428a9f84 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0bbaf1d24d4b0b7a694...
commit 0bbaf1d24d4b0b7a6944438e689a81d820be0f3d
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Layout doesn't need to handle the old insane textarea box splitting now. Fixes Coverity:1109882.
diff --git a/render/layout.c b/render/layout.c
index 14d06ee..9827cda 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -2184,18 +2184,7 @@ static bool layout_text_box_split(html_content *content,
c2->flags |= CLONE;
/* Set remaining text in c2 */
- if (split_box->parent->parent->gadget != NULL) {
- /* Inside a form text input / textarea, special case */
- /* TODO: Move text inputs to core textarea widget and remove
- * this */
- c2->text = talloc_strndup(content->bctx,
- split_box->text + used_length,
- split_box->length - used_length);
- if (!c2->text)
- return false;
- } else {
- c2->text += used_length;
- }
+ c2->text += used_length;
/* Set c2 according to the remaining text */
c2->width -= new_width + space_width;
-----------------------------------------------------------------------
Summary of changes:
render/layout.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/render/layout.c b/render/layout.c
index 14d06ee..9827cda 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -2184,18 +2184,7 @@ static bool layout_text_box_split(html_content *content,
c2->flags |= CLONE;
/* Set remaining text in c2 */
- if (split_box->parent->parent->gadget != NULL) {
- /* Inside a form text input / textarea, special case */
- /* TODO: Move text inputs to core textarea widget and remove
- * this */
- c2->text = talloc_strndup(content->bctx,
- split_box->text + used_length,
- split_box->length - used_length);
- if (!c2->text)
- return false;
- } else {
- c2->text += used_length;
- }
+ c2->text += used_length;
/* Set c2 according to the remaining text */
c2->width -= new_width + space_width;
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-648-g3e08819
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/3e08819db94ae86f995e1...
...commit http://git.netsurf-browser.org/netsurf.git/commit/3e08819db94ae86f995e1e1...
...tree http://git.netsurf-browser.org/netsurf.git/tree/3e08819db94ae86f995e1e146...
The branch, master has been updated
via 3e08819db94ae86f995e1e14650258c6428a9f84 (commit)
via 479fcefd9adb9f234346b1e87bd0e128738c0446 (commit)
from a515248b59d5388dae1d022fabde8b1e6ac9a004 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3e08819db94ae86f995...
commit 3e08819db94ae86f995e1e14650258c6428a9f84
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix leaks in form_successful_controls. 'charset' was always leaked, value was leaked in particular OOM case.
diff --git a/render/form.c b/render/form.c
index 684e1c8..ebe9b6f 100644
--- a/render/form.c
+++ b/render/form.c
@@ -611,6 +611,7 @@ bool form_successful_controls(struct form *form,
success_new = malloc(sizeof(*success_new));
if (!success_new) {
LOG(("malloc failed"));
+ free(value);
goto no_memory;
}
success_new->file = false;
@@ -626,11 +627,14 @@ bool form_successful_controls(struct form *form,
}
}
+ free(charset);
+
*successful_controls = sentinel.next;
return true;
no_memory:
warn_user("NoMemory", 0);
+ free(charset);
fetch_multipart_data_destroy(sentinel.next);
return false;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=479fcefd9adb9f23434...
commit 479fcefd9adb9f234346b1e87bd0e128738c0446
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
s/!charset/charset == NULL/
diff --git a/render/form.c b/render/form.c
index a6784e2..684e1c8 100644
--- a/render/form.c
+++ b/render/form.c
@@ -349,7 +349,7 @@ bool form_successful_controls(struct form *form,
sentinel.next = NULL;
charset = form_acceptable_charset(form);
- if (!charset)
+ if (charset == NULL)
return false;
#define ENCODE_ITEM(i) form_encode_item((i), charset, form->document_charset)
-----------------------------------------------------------------------
Summary of changes:
render/form.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/render/form.c b/render/form.c
index a6784e2..ebe9b6f 100644
--- a/render/form.c
+++ b/render/form.c
@@ -349,7 +349,7 @@ bool form_successful_controls(struct form *form,
sentinel.next = NULL;
charset = form_acceptable_charset(form);
- if (!charset)
+ if (charset == NULL)
return false;
#define ENCODE_ITEM(i) form_encode_item((i), charset, form->document_charset)
@@ -611,6 +611,7 @@ bool form_successful_controls(struct form *form,
success_new = malloc(sizeof(*success_new));
if (!success_new) {
LOG(("malloc failed"));
+ free(value);
goto no_memory;
}
success_new->file = false;
@@ -626,11 +627,14 @@ bool form_successful_controls(struct form *form,
}
}
+ free(charset);
+
*successful_controls = sentinel.next;
return true;
no_memory:
warn_user("NoMemory", 0);
+ free(charset);
fetch_multipart_data_destroy(sentinel.next);
return false;
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-646-ga515248
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/a515248b59d5388dae1d0...
...commit http://git.netsurf-browser.org/netsurf.git/commit/a515248b59d5388dae1d022...
...tree http://git.netsurf-browser.org/netsurf.git/tree/a515248b59d5388dae1d022fa...
The branch, master has been updated
via a515248b59d5388dae1d022fabde8b1e6ac9a004 (commit)
via 5cddb4ff3c270002e7b1a10b65a6af4c35bca20f (commit)
via df4975b8d4a0993ad33bf8cc62546ebfd586097a (commit)
via e5823beb61ce8b719be503a16c649f595170994f (commit)
via 89b669919e93507c6fbd6d89bdee2cd0d8144f9a (commit)
via 640bb77330114b1e08d7bb57080dc3a45a5e5baf (commit)
via f814debfe22d142a2e462e4b4ae0ea213f1af416 (commit)
from 441e0dcbedfcdf4ade627149607df07ce20e15b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a515248b59d5388dae1...
commit a515248b59d5388dae1d022fabde8b1e6ac9a004
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix two genuine bugs found by Coverity. Checking the wrong pointers for NULL.
diff --git a/image/png.c b/image/png.c
index 2a83346..0f9b9cb 100644
--- a/image/png.c
+++ b/image/png.c
@@ -430,7 +430,7 @@ png_cache_convert(struct content *c)
{
png_structp png_ptr;
png_infop info_ptr;
- png_infop end_info;
+ png_infop end_info_ptr;
volatile struct bitmap *bitmap = NULL;
struct png_cache_read_data_s png_cache_read_data;
png_uint_32 width, height;
@@ -444,22 +444,20 @@ png_cache_convert(struct content *c)
return NULL;
}
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
- NULL,
- nspng_error,
- nspng_warning);
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
+ nspng_error, nspng_warning);
if (png_ptr == NULL) {
return NULL;
}
info_ptr = png_create_info_struct(png_ptr);
- if (png_ptr == NULL) {
+ if (info_ptr == NULL) {
png_destroy_read_struct(&png_ptr, NULL, NULL);
return NULL;
}
- end_info = png_create_info_struct(png_ptr);
- if (png_ptr == NULL) {
+ end_info_ptr = png_create_info_struct(png_ptr);
+ if (end_info_ptr == NULL) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
return NULL;
}
@@ -480,7 +478,7 @@ png_cache_convert(struct content *c)
nspng_setup_transforms(png_ptr, info_ptr);
width = png_get_image_width(png_ptr, info_ptr);
- height = png_get_image_height(png_ptr,info_ptr);
+ height = png_get_image_height(png_ptr, info_ptr);
/* Claim the required memory for the converted PNG */
bitmap = bitmap_create(width, height, BITMAP_NEW);
@@ -498,7 +496,7 @@ png_cache_convert(struct content *c)
png_cache_convert_error:
/* cleanup png read */
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info_ptr);
free((png_bytep *) row_pointers);
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=5cddb4ff3c270002e7b...
commit 5cddb4ff3c270002e7b1a10b65a6af4c35bca20f
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Assert that root node is non-NULL.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index c14d7a8..8bf4923 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -321,6 +321,8 @@ static nserror treeview_walk_internal(treeview_node *root, bool full,
bool skip_children = false;
nserror err;
+ assert(root != NULL);
+
node = root;
parent = node->parent;
next_sibling = node->next_sib;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=df4975b8d4a0993ad33...
commit df4975b8d4a0993ad33bf8cc62546ebfd586097a
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Remove unnecessary check.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index c14086d..c14d7a8 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -225,8 +225,7 @@ static inline treeview_node * treeview_node_next(treeview_node *node, bool full)
* go to next sibling if present, or nearest ancestor
* with a next sibling. */
- while (node != NULL && node->parent != NULL &&
- node->next_sib == NULL) {
+ while (node->parent != NULL && node->next_sib == NULL) {
node = node->parent;
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e5823beb61ce8b719be...
commit e5823beb61ce8b719be503a16c649f595170994f
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix deref before NULL check.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 3191515..c14086d 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -1101,6 +1101,9 @@ static nserror treeview_delete_empty_nodes(treeview *tree, bool interaction)
.user_interaction = interaction
};
+ assert(tree != NULL);
+ assert(tree->root != NULL);
+
node = tree->root;
parent = node->parent;
next_sibling = node->next_sib;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=89b669919e93507c6fb...
commit 89b669919e93507c6fbd6d89bdee2cd0d8144f9a
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix NULL check after deref.
diff --git a/desktop/textinput.c b/desktop/textinput.c
index d2a9dad..e804829 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -103,13 +103,14 @@ void browser_window_remove_caret(struct browser_window *bw, bool only_hide)
struct browser_window *root_bw;
root_bw = browser_window_get_root(bw);
+ assert(root_bw != NULL);
if (only_hide)
root_bw->can_edit = true;
else
root_bw->can_edit = false;
- if (root_bw && root_bw->window)
+ if (root_bw->window)
gui_window_remove_caret(root_bw->window);
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=640bb77330114b1e08d...
commit 640bb77330114b1e08d7bb57080dc3a45a5e5baf
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Dodge Coverity scan issue.
diff --git a/desktop/textarea.c b/desktop/textarea.c
index b112a6b..bfa07ad 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -1661,7 +1661,9 @@ static bool textarea_undo(struct textarea *ta, bool forward,
false, &byte_delta, r);
/* Update undo buffer for redo */
- memcpy(ta->undo.text.data + detail->b_start, temp, b_text_len);
+ if (temp != NULL)
+ memcpy(ta->undo.text.data + detail->b_start, temp, b_text_len);
+
detail->b_text_end = detail->b_text_start + b_len;
detail->b_end = detail->b_start + b_text_len;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f814debfe22d142a2e4...
commit f814debfe22d142a2e462e4b4ae0ea213f1af416
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Remove unreachable safty net.
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index bedb095..372ae5c 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -93,7 +93,7 @@ static nserror hotlist_create_treeview_field_visits_data(
e->data[HL_LAST_VISIT].field = hl_ctx.fields[HL_LAST_VISIT].field;
e->data[HL_LAST_VISIT].value = last_visited2;
- e->data[HL_LAST_VISIT].value_len = (last_visited2 != NULL) ? 24 : 0;
+ e->data[HL_LAST_VISIT].value_len = 24;
/* Visits */
len = snprintf(buffer, 16, "%u", data->visits);
-----------------------------------------------------------------------
Summary of changes:
desktop/hotlist.c | 2 +-
desktop/textarea.c | 4 +++-
desktop/textinput.c | 3 ++-
desktop/treeview.c | 8 ++++++--
image/png.c | 18 ++++++++----------
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index bedb095..372ae5c 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -93,7 +93,7 @@ static nserror hotlist_create_treeview_field_visits_data(
e->data[HL_LAST_VISIT].field = hl_ctx.fields[HL_LAST_VISIT].field;
e->data[HL_LAST_VISIT].value = last_visited2;
- e->data[HL_LAST_VISIT].value_len = (last_visited2 != NULL) ? 24 : 0;
+ e->data[HL_LAST_VISIT].value_len = 24;
/* Visits */
len = snprintf(buffer, 16, "%u", data->visits);
diff --git a/desktop/textarea.c b/desktop/textarea.c
index b112a6b..bfa07ad 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -1661,7 +1661,9 @@ static bool textarea_undo(struct textarea *ta, bool forward,
false, &byte_delta, r);
/* Update undo buffer for redo */
- memcpy(ta->undo.text.data + detail->b_start, temp, b_text_len);
+ if (temp != NULL)
+ memcpy(ta->undo.text.data + detail->b_start, temp, b_text_len);
+
detail->b_text_end = detail->b_text_start + b_len;
detail->b_end = detail->b_start + b_text_len;
diff --git a/desktop/textinput.c b/desktop/textinput.c
index d2a9dad..e804829 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -103,13 +103,14 @@ void browser_window_remove_caret(struct browser_window *bw, bool only_hide)
struct browser_window *root_bw;
root_bw = browser_window_get_root(bw);
+ assert(root_bw != NULL);
if (only_hide)
root_bw->can_edit = true;
else
root_bw->can_edit = false;
- if (root_bw && root_bw->window)
+ if (root_bw->window)
gui_window_remove_caret(root_bw->window);
}
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 3191515..8bf4923 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -225,8 +225,7 @@ static inline treeview_node * treeview_node_next(treeview_node *node, bool full)
* go to next sibling if present, or nearest ancestor
* with a next sibling. */
- while (node != NULL && node->parent != NULL &&
- node->next_sib == NULL) {
+ while (node->parent != NULL && node->next_sib == NULL) {
node = node->parent;
}
@@ -322,6 +321,8 @@ static nserror treeview_walk_internal(treeview_node *root, bool full,
bool skip_children = false;
nserror err;
+ assert(root != NULL);
+
node = root;
parent = node->parent;
next_sibling = node->next_sib;
@@ -1101,6 +1102,9 @@ static nserror treeview_delete_empty_nodes(treeview *tree, bool interaction)
.user_interaction = interaction
};
+ assert(tree != NULL);
+ assert(tree->root != NULL);
+
node = tree->root;
parent = node->parent;
next_sibling = node->next_sib;
diff --git a/image/png.c b/image/png.c
index 2a83346..0f9b9cb 100644
--- a/image/png.c
+++ b/image/png.c
@@ -430,7 +430,7 @@ png_cache_convert(struct content *c)
{
png_structp png_ptr;
png_infop info_ptr;
- png_infop end_info;
+ png_infop end_info_ptr;
volatile struct bitmap *bitmap = NULL;
struct png_cache_read_data_s png_cache_read_data;
png_uint_32 width, height;
@@ -444,22 +444,20 @@ png_cache_convert(struct content *c)
return NULL;
}
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
- NULL,
- nspng_error,
- nspng_warning);
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
+ nspng_error, nspng_warning);
if (png_ptr == NULL) {
return NULL;
}
info_ptr = png_create_info_struct(png_ptr);
- if (png_ptr == NULL) {
+ if (info_ptr == NULL) {
png_destroy_read_struct(&png_ptr, NULL, NULL);
return NULL;
}
- end_info = png_create_info_struct(png_ptr);
- if (png_ptr == NULL) {
+ end_info_ptr = png_create_info_struct(png_ptr);
+ if (end_info_ptr == NULL) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
return NULL;
}
@@ -480,7 +478,7 @@ png_cache_convert(struct content *c)
nspng_setup_transforms(png_ptr, info_ptr);
width = png_get_image_width(png_ptr, info_ptr);
- height = png_get_image_height(png_ptr,info_ptr);
+ height = png_get_image_height(png_ptr, info_ptr);
/* Claim the required memory for the converted PNG */
bitmap = bitmap_create(width, height, BITMAP_NEW);
@@ -498,7 +496,7 @@ png_cache_convert(struct content *c)
png_cache_convert_error:
/* cleanup png read */
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info_ptr);
free((png_bytep *) row_pointers);
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-639-g441e0dc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/441e0dcbedfcdf4ade627...
...commit http://git.netsurf-browser.org/netsurf.git/commit/441e0dcbedfcdf4ade62714...
...tree http://git.netsurf-browser.org/netsurf.git/tree/441e0dcbedfcdf4ade6271496...
The branch, master has been updated
via 441e0dcbedfcdf4ade627149607df07ce20e15b4 (commit)
from 3a35294a0ed73266248c9ff12a436478197c575f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=441e0dcbedfcdf4ade6...
commit 441e0dcbedfcdf4ade627149607df07ce20e15b4
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Assert target node is non-NULL.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index d9e1f9e..3191515 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -2708,6 +2708,7 @@ static bool treeview_set_move_indicator(treeview *tree, bool need_redraw,
assert(tree != NULL);
assert(tree->root != NULL);
assert(tree->root->children != NULL);
+ assert(target != NULL);
if (target->flags & TREE_NODE_SELECTED) {
/* Find top selected ancestor */
-----------------------------------------------------------------------
Summary of changes:
desktop/treeview.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/desktop/treeview.c b/desktop/treeview.c
index d9e1f9e..3191515 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -2708,6 +2708,7 @@ static bool treeview_set_move_indicator(treeview *tree, bool need_redraw,
assert(tree != NULL);
assert(tree->root != NULL);
assert(tree->root->children != NULL);
+ assert(target != NULL);
if (target->flags & TREE_NODE_SELECTED) {
/* Find top selected ancestor */
--
NetSurf Browser
9 years, 3 months
netsurf: branch master updated. release/3.0-638-g3a35294
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/3a35294a0ed73266248c9...
...commit http://git.netsurf-browser.org/netsurf.git/commit/3a35294a0ed73266248c9ff...
...tree http://git.netsurf-browser.org/netsurf.git/tree/3a35294a0ed73266248c9ff12...
The branch, master has been updated
via 3a35294a0ed73266248c9ff12a436478197c575f (commit)
from 56723e5898217cc10f808bad18bc39a4e5bcae79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3a35294a0ed73266248...
commit 3a35294a0ed73266248c9ff12a436478197c575f
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Fix adding to hotlist from context menu
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 03672ef..c951b01 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -767,12 +767,11 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
case CMID_URLHOTLIST:
case CMID_PAGEHOTLIST:
{
- nsurl *nsurl;
- if (nsurl_create(url, &nsurl) != NSERROR_OK)
+ if (nsurl_create(userdata, &url) != NSERROR_OK)
break;
- hotlist_add_url(nsurl);
- nsurl_unref(nsurl);
+ hotlist_add_url(url);
+ nsurl_unref(url);
}
break;
-----------------------------------------------------------------------
Summary of changes:
amiga/context_menu.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 03672ef..c951b01 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -767,12 +767,11 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
case CMID_URLHOTLIST:
case CMID_PAGEHOTLIST:
{
- nsurl *nsurl;
- if (nsurl_create(url, &nsurl) != NSERROR_OK)
+ if (nsurl_create(userdata, &url) != NSERROR_OK)
break;
- hotlist_add_url(nsurl);
- nsurl_unref(nsurl);
+ hotlist_add_url(url);
+ nsurl_unref(url);
}
break;
--
NetSurf Browser
9 years, 3 months