Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/824ad8857031685ab30b78fbc63a5a6eea0dc597
...commit
http://git.netsurf-browser.org/netsurf.git/commit/824ad8857031685ab30b78fbc63a5a6eea0dc597
...tree
http://git.netsurf-browser.org/netsurf.git/tree/824ad8857031685ab30b78fbc63a5a6eea0dc597
The branch, jmb/bm has been updated
via 824ad8857031685ab30b78fbc63a5a6eea0dc597 (commit)
from 3db455408d1528c00d95702b0cb303d405342932 (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=824ad8857031685ab30b78fbc63a5a6eea0dc597
commit 824ad8857031685ab30b78fbc63a5a6eea0dc597
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
HTML: skip invalid queue entries
diff --git a/content/handlers/html/box/manager.c
b/content/handlers/html/box/manager.c
index abcd5c5d8..6c3049329 100644
--- a/content/handlers/html/box/manager.c
+++ b/content/handlers/html/box/manager.c
@@ -54,6 +54,11 @@ box_manager_process_events(void *pw)
* their parent) */
for (i = mgr->pending_queue_idx; i > 0; i--) {
bool contains = false;
+
+ if (mgr->pending_queue[i-1] == NULL) {
+ continue;
+ }
+
exc = dom_node_contains(mgr->doc, mgr->pending_queue[i-1],
&contains);
if (exc == DOM_NO_ERR && contains == false) {
@@ -64,6 +69,10 @@ box_manager_process_events(void *pw)
/* 2. Eliminate duplicate nodes from the list */
for (j = mgr->pending_queue_idx; j > i + 1; j--) {
+ if (mgr->pending_queue[j-1] == NULL) {
+ continue;
+ }
+
if (mgr->pending_queue[i-1] ==
mgr->pending_queue[j-1]) {
dom_node_unref(mgr->pending_queue[i-1]);
@@ -82,6 +91,11 @@ box_manager_process_events(void *pw)
for (j = mgr->pending_queue_idx; j > 0; j--) {
bool contains = false;
+
+ if (mgr->pending_queue[j-1] == NULL) {
+ continue;
+ }
+
exc = dom_node_contains(mgr->pending_queue[j-1],
mgr->pending_queue[i-1], &contains);
if (exc == DOM_NO_ERR && contains == true) {
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/box/manager.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/content/handlers/html/box/manager.c
b/content/handlers/html/box/manager.c
index abcd5c5d8..6c3049329 100644
--- a/content/handlers/html/box/manager.c
+++ b/content/handlers/html/box/manager.c
@@ -54,6 +54,11 @@ box_manager_process_events(void *pw)
* their parent) */
for (i = mgr->pending_queue_idx; i > 0; i--) {
bool contains = false;
+
+ if (mgr->pending_queue[i-1] == NULL) {
+ continue;
+ }
+
exc = dom_node_contains(mgr->doc, mgr->pending_queue[i-1],
&contains);
if (exc == DOM_NO_ERR && contains == false) {
@@ -64,6 +69,10 @@ box_manager_process_events(void *pw)
/* 2. Eliminate duplicate nodes from the list */
for (j = mgr->pending_queue_idx; j > i + 1; j--) {
+ if (mgr->pending_queue[j-1] == NULL) {
+ continue;
+ }
+
if (mgr->pending_queue[i-1] ==
mgr->pending_queue[j-1]) {
dom_node_unref(mgr->pending_queue[i-1]);
@@ -82,6 +91,11 @@ box_manager_process_events(void *pw)
for (j = mgr->pending_queue_idx; j > 0; j--) {
bool contains = false;
+
+ if (mgr->pending_queue[j-1] == NULL) {
+ continue;
+ }
+
exc = dom_node_contains(mgr->pending_queue[j-1],
mgr->pending_queue[i-1], &contains);
if (exc == DOM_NO_ERR && contains == true) {
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
