March 2007 - netsurf-commits - listmaster.pepperfish.net

r3218 jmb - /trunk/netsurf/render/layout.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Mar 24 21:03:36 2007 New Revision: 3218 URL: http://svn.semichrome.net?rev=3218&view=rev Log: Fix FP exception when right-aligned tables with margin: auto are nested (interaction with floats, resulting in margin[TOP] == AUTO) (fixes 1662931) Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://svn.semichrome.net/trunk/netsurf/render/layout.c?rev=3218&r1=3217&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Sat Mar 24 21:03:36 2007 @@ -1273,6 +1273,7 @@ if (!layout_float(d, *width, content)) return false; + LOG(("%p : %d %d", d, d->margin[TOP], d->border[TOP])); d->x = d->margin[LEFT] + d->border[LEFT]; d->y = d->margin[TOP] + d->border[TOP]; b->width = d->margin[LEFT] + d->border[LEFT] + @@ -1717,6 +1718,10 @@ b->margin[LEFT] = 0; if (b->margin[RIGHT] == AUTO) b->margin[RIGHT] = 0; + if (b->margin[TOP] == AUTO) + b->margin[TOP] = 0; + if (b->margin[BOTTOM] == AUTO) + b->margin[BOTTOM] = 0; } else return layout_block_context(b, content); return true;

16 years

1
0
0 / 0

r3217 jmb - /trunk/netsurftest/works/float-nested-table.html

by netsurf＠semichrome.net

Author: jmb Date: Sat Mar 24 21:01:15 2007 New Revision: 3217 URL: http://svn.semichrome.net?rev=3217&view=rev Log: Add testcase for tables nested inside floats Added: trunk/netsurftest/works/float-nested-table.html Added: trunk/netsurftest/works/float-nested-table.html URL: http://svn.semichrome.net/trunk/netsurftest/works/float-nested-table.html... ============================================================================== --- trunk/netsurftest/works/float-nested-table.html (added) +++ trunk/netsurftest/works/float-nested-table.html Sat Mar 24 21:01:15 2007 @@ -1,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> + <title>Floated table with auto margins</title> + <style type="text/css"> table { margin: auto; }</style> + </head> +<body> + <p> This page should not cause NetSurf to crash </p> + <table> + <tr> + <td> + <table align="right"> + <tr> + <td> + <table align="right"> + <tr> + <td>Some text</td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + </table> +</body> +</html>

16 years

1
0
0 / 0

r3216 jmb - /trunk/netsurf/content/fetch.c

by netsurf＠semichrome.net

Author: jmb Date: Fri Mar 23 22:39:10 2007 New Revision: 3216 URL: http://svn.semichrome.net?rev=3216&view=rev Log: Fix crash on WWW-Authenticate header with no realm (1686714) Modified: trunk/netsurf/content/fetch.c Modified: trunk/netsurf/content/fetch.c URL: http://svn.semichrome.net/trunk/netsurf/content/fetch.c?rev=3216&r1=3215&... ============================================================================== --- trunk/netsurf/content/fetch.c (original) +++ trunk/netsurf/content/fetch.c Fri Mar 23 22:39:10 2007 @@ -1167,21 +1167,24 @@ } SKIP_ST(17); - while (i < (int) size && strncasecmp(data + i, "realm", 5)) + while (i < (int) size - 5 && + strncasecmp(data + i, "realm", 5)) i++; - while (i < (int)size && data[++i] != '"') + while (i < (int) size - 1 && data[++i] != '"') /* */; i++; - strncpy(f->realm, data + i, size - i); - f->realm[size - i] = '\0'; - for (i = size - i - 1; i >= 0 && - (f->realm[i] == ' ' || - f->realm[i] == '"' || - f->realm[i] == '\t' || - f->realm[i] == '\r' || - f->realm[i] == '\n'); --i) - f->realm[i] = '\0'; + if (i < (int) size) { + strncpy(f->realm, data + i, size - i); + f->realm[size - i] = '\0'; + for (i = size - i - 1; i >= 0 && + (f->realm[i] == ' ' || + f->realm[i] == '"' || + f->realm[i] == '\t' || + f->realm[i] == '\r' || + f->realm[i] == '\n'); --i) + f->realm[i] = '\0'; + } #endif } else if (5 < size && strncasecmp(data, "Date:", 5) == 0) { /* extract Date header */

16 years

1
0
0 / 0

r3215 jmb - /trunk/netsurf/render/box_construct.c

by netsurf＠semichrome.net

Author: jmb Date: Thu Mar 22 22:47:24 2007 New Revision: 3215 URL: http://svn.semichrome.net?rev=3215&view=rev Log: Make <object> attribute handling more spec compliant Modified: trunk/netsurf/render/box_construct.c Modified: trunk/netsurf/render/box_construct.c URL: http://svn.semichrome.net/trunk/netsurf/render/box_construct.c?rev=3215&r... ============================================================================== --- trunk/netsurf/render/box_construct.c (original) +++ trunk/netsurf/render/box_construct.c Thu Mar 22 22:47:24 2007 @@ -1375,18 +1375,19 @@ params->classid = 0; params->params = 0; - /* codebase, classid, and data are URLs (codebase is the base for the - * other two) */ + /* codebase, classid, and data are URLs + * (codebase is the base for the other two) */ if ((codebase = xmlGetProp(n, (const xmlChar *) "codebase"))) { if (!box_extract_link((char *) codebase, - content->data.html.base_url, &params->codebase)) + content->data.html.base_url, + &params->codebase)) return false; xmlFree(codebase); } if (!params->codebase) params->codebase = content->data.html.base_url; - if ((classid = xmlGetProp(n, (const xmlChar *) "codebase"))) { + if ((classid = xmlGetProp(n, (const xmlChar *) "classid"))) { if (!box_extract_link((char *) classid, params->codebase, &params->classid)) return false; @@ -1399,12 +1400,20 @@ return false; xmlFree(data); } - if (!params->data) - /* objects without data are ignored */ + + if (!params->classid && !params->data) + /* nothing to embed; ignore */ return true; /* Don't include ourself */ - if (strcmp(content->data.html.base_url, params->data) == 0) + if (params->classid && + strcmp(content->data.html.base_url, + params->classid) == 0) + return true; + + if (params->data && + strcmp(content->data.html.base_url, + params->data) == 0) return true; /* codetype and type are MIME types */ @@ -1412,7 +1421,18 @@ return false; if (!box_get_attribute(n, "type", params, &params->type)) return false; - if (params->type && content_lookup(params->type) == CONTENT_OTHER) + + /* classid && !data => classid is used (consult codetype) + * (classid || !classid) && data => data is used (consult type) + * !classid && !data => invalid; ignored */ + + if (params->classid && !params->data && params->codetype && + content_lookup(params->codetype) == CONTENT_OTHER) + /* can't handle this MIME type */ + return true; + + if (params->data && params->type && + content_lookup(params->type) == CONTENT_OTHER) /* can't handle this MIME type */ return true; @@ -1456,8 +1476,9 @@ box->object_params = params; /* start fetch (MIME type is ok or not specified) */ - if (!html_fetch_object(content, params->data, box, 0, - content->available_width, 1000, false)) + if (!html_fetch_object(content, + params->data ? params->data : params->classid, + box, 0, content->available_width, 1000, false)) return false; /* convert children and place into fallback */

16 years

1
0
0 / 0

r3214 jmb - in /trunk/netsurf: css/css.c render/html.c

by netsurf＠semichrome.net

Author: jmb Date: Mon Mar 19 00:04:09 2007 New Revision: 3214 URL: http://svn.semichrome.net?rev=3214&view=rev Log: Fix invalidation of unwanted contents. Modified: trunk/netsurf/css/css.c trunk/netsurf/render/html.c Modified: trunk/netsurf/css/css.c URL: http://svn.semichrome.net/trunk/netsurf/css/css.c?rev=3214&r1=3213&r2=321... ============================================================================== --- trunk/netsurf/css/css.c (original) +++ trunk/netsurf/css/css.c Mon Mar 19 00:04:09 2007 @@ -899,6 +899,17 @@ if (css->type != CONTENT_CSS) { content_remove_user(css, css_atimport_callback, (intptr_t) c, i); + if (!css->user_list->next) { + /* We were only user and we don't + * want this content, so stop it + * fetching and mark it as having + * an error so it gets removed from + * the cache next time + * content_clean() gets called */ + fetch_abort(css->fetch); + css->fetch = 0; + css->status = CONTENT_STATUS_ERROR; + } c->data.css.import_content[i] = 0; c->active--; content_add_error(c, "NotCSS", 0); Modified: trunk/netsurf/render/html.c URL: http://svn.semichrome.net/trunk/netsurf/render/html.c?rev=3214&r1=3213&r2... ============================================================================== --- trunk/netsurf/render/html.c (original) +++ trunk/netsurf/render/html.c Mon Mar 19 00:04:09 2007 @@ -897,7 +897,7 @@ content_remove_user(css, html_convert_css_callback, (intptr_t) c, i); - if (!css->user_list) { + if (!css->user_list->next) { /* we were the only user and we * don't want this content, so * stop it fetching and mark it @@ -1144,6 +1144,17 @@ content_broadcast(c, CONTENT_MSG_STATUS, data); content_remove_user(object, html_object_callback, (intptr_t) c, i); + if (!object->user_list->next) { + /* we were the only user and we + * don't want this content, so + * stop it fetching and mark it + * as having an error so it gets + * removed from the cache next time + * content_clean() gets called */ + fetch_abort(object->fetch); + object->fetch = 0; + object->status = CONTENT_STATUS_ERROR; + } html_object_failed(box, c, c->data.html.object[i].background); break;

16 years

1
0
0 / 0

r3213 jmb - in /trunk/netsurf: content/content.c css/css.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 18 23:48:12 2007 New Revision: 3213 URL: http://svn.semichrome.net?rev=3213&view=rev Log: Lose noisy logging Modified: trunk/netsurf/content/content.c trunk/netsurf/css/css.c Modified: trunk/netsurf/content/content.c URL: http://svn.semichrome.net/trunk/netsurf/content/content.c?rev=3213&r1=321... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Sun Mar 18 23:48:12 2007 @@ -947,7 +947,7 @@ float scale, unsigned long background_colour) { assert(c != 0); - LOG(("%p %s", c, c->url)); +// LOG(("%p %s", c, c->url)); if (c->locked) /* not safe to attempt redraw */ return true; @@ -976,7 +976,7 @@ assert(c != 0); - LOG(("%p %s", c, c->url)); +// LOG(("%p %s", c, c->url)); if (c->locked) /* not safe to attempt redraw */ @@ -1124,7 +1124,7 @@ { struct content_user *user, *next; assert(c); - LOG(("%p %s -> %d", c, c->url, msg)); +// LOG(("%p %s -> %d", c, c->url, msg)); for (user = c->user_list->next; user != 0; user = next) { next = user->next; /* user may be destroyed during callback */ if (user->callback != 0) Modified: trunk/netsurf/css/css.c URL: http://svn.semichrome.net/trunk/netsurf/css/css.c?rev=3213&r1=3212&r2=321... ============================================================================== --- trunk/netsurf/css/css.c (original) +++ trunk/netsurf/css/css.c Sun Mar 18 23:48:12 2007 @@ -451,7 +451,6 @@ /* complete fetch of any imported stylesheets */ while (c->active != 0) { - LOG(("importing %i from '%s'", c->active, c->url)); fetch_poll(); gui_multitask(); }

16 years

1
0
0 / 0

r3212 jmb - in /trunk/netsurf: content/content.c css/css.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 18 20:19:13 2007 New Revision: 3212 URL: http://svn.semichrome.net?rev=3212&view=rev Log: Ensure content structures are zero initialised. Make css_destroy check that the stylesheet pointer exists (content destructors may be called whilst the content is still loading - e.g. if the content type isn't permissable in the context it was loaded from). Fixes 1627413, 1580980. Modified: trunk/netsurf/content/content.c trunk/netsurf/css/css.c Modified: trunk/netsurf/content/content.c URL: http://svn.semichrome.net/trunk/netsurf/content/content.c?rev=3212&r1=321... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Sun Mar 18 20:19:13 2007 @@ -348,7 +348,7 @@ struct content *c; struct content_user *user_sentinel; - c = talloc(0, struct content); + c = talloc_zero(0, struct content); if (!c) return 0; Modified: trunk/netsurf/css/css.c URL: http://svn.semichrome.net/trunk/netsurf/css/css.c?rev=3212&r1=3211&r2=321... ============================================================================== --- trunk/netsurf/css/css.c (original) +++ trunk/netsurf/css/css.c Sun Mar 18 20:19:13 2007 @@ -470,13 +470,16 @@ unsigned int i; struct css_selector *r; - for (i = 0; i != HASH_SIZE; i++) { - for (r = c->data.css.css->rule[i]; r != 0; r = r->next) { - css_deep_free_style(r->style); - } - css_free_selector(c->data.css.css->rule[i]); - } - free(c->data.css.css); + if (c->data.css.css) { + for (i = 0; i != HASH_SIZE; i++) { + for (r = c->data.css.css->rule[i]; r != 0; + r = r->next) { + css_deep_free_style(r->style); + } + css_free_selector(c->data.css.css->rule[i]); + } + free(c->data.css.css); + } /* imported stylesheets */ for (i = 0; i != c->data.css.import_count; i++)

16 years

1
0
0 / 0

r3211 jmb - in /trunk/netsurf: css/css.c render/html.c riscos/plugin.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 18 17:09:55 2007 New Revision: 3211 URL: http://svn.semichrome.net?rev=3211&view=rev Log: Ensure content owners check that they are still interested in a content when receiving notification that the content's in error. This prevents content pointers being corrupted when redirects occur. Fixes 1522002, 1551475. Modified: trunk/netsurf/css/css.c trunk/netsurf/render/html.c trunk/netsurf/riscos/plugin.c Modified: trunk/netsurf/css/css.c URL: http://svn.semichrome.net/trunk/netsurf/css/css.c?rev=3211&r1=3210&r2=321... ============================================================================== --- trunk/netsurf/css/css.c (original) +++ trunk/netsurf/css/css.c Sun Mar 18 17:09:55 2007 @@ -919,9 +919,16 @@ #endif /* todo: handle AUTH and SSL */ case CONTENT_MSG_ERROR: - c->data.css.import_content[i] = 0; - c->active--; - content_add_error(c, "?", 0); + /* The stylesheet we were fetching may have been + * redirected, in that case, the object pointers + * will differ, so ensure that the object that's + * in error is still in use by us before invalidating + * the pointer */ + if (c->data.css.import_content[i] == css) { + c->data.css.import_content[i] = 0; + c->active--; + content_add_error(c, "?", 0); + } break; case CONTENT_MSG_STATUS: Modified: trunk/netsurf/render/html.c URL: http://svn.semichrome.net/trunk/netsurf/render/html.c?rev=3211&r1=3210&r2... ============================================================================== --- trunk/netsurf/render/html.c (original) +++ trunk/netsurf/render/html.c Sun Mar 18 17:09:55 2007 @@ -920,9 +920,16 @@ break; case CONTENT_MSG_ERROR: - c->data.html.stylesheet_content[i] = 0; - c->active--; - content_add_error(c, "?", 0); + /* The stylesheet we were fetching may have been + * redirected, in that case, the object pointers + * will differ, so ensure that the object that's + * in error is still in use by us before invalidating + * the pointer */ + if (c->data.html.stylesheet_content[i] == css) { + c->data.html.stylesheet_content[i] = 0; + c->active--; + content_add_error(c, "?", 0); + } break; case CONTENT_MSG_STATUS: @@ -1161,13 +1168,21 @@ break; case CONTENT_MSG_ERROR: - c->data.html.object[i].content = 0; - c->active--; - content_add_error(c, "?", 0); - html_set_status(c, data.error); - content_broadcast(c, CONTENT_MSG_STATUS, data); - html_object_failed(box, c, + /* The object we were fetching may have been + * redirected, in that case, the object pointers + * will differ, so ensure that the object that's + * in error is still in use by us before invalidating + * the pointer */ + if (c->data.html.object[i].content == object) { + c->data.html.object[i].content = 0; + c->active--; + content_add_error(c, "?", 0); + html_set_status(c, data.error); + content_broadcast(c, CONTENT_MSG_STATUS, + data); + html_object_failed(box, c, c->data.html.object[i].background); + } break; case CONTENT_MSG_STATUS: Modified: trunk/netsurf/riscos/plugin.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/plugin.c?rev=3211&r1=3210&... ============================================================================== --- trunk/netsurf/riscos/plugin.c (original) +++ trunk/netsurf/riscos/plugin.c Sun Mar 18 17:09:55 2007 @@ -1683,7 +1683,14 @@ break; case CONTENT_MSG_ERROR: - plugin_destroy_stream(p, plugin_STREAM_DESTROY_ERROR); + /* The plugin we were fetching may have been + * redirected, in that case, the object pointers + * will differ, so ensure that the object that's + * in error is still in use by us before destroying + * the stream */ + if (p->c == c) + plugin_destroy_stream(p, + plugin_STREAM_DESTROY_ERROR); break; case CONTENT_MSG_REDIRECT:

16 years

1
0
0 / 0

r3210 jmb - /trunk/netsurf/content/content.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 18 17:04:18 2007 New Revision: 3210 URL: http://svn.semichrome.net?rev=3210&view=rev Log: Improve debug output so that content usage may be traced Modified: trunk/netsurf/content/content.c Modified: trunk/netsurf/content/content.c URL: http://svn.semichrome.net/trunk/netsurf/content/content.c?rev=3210&r1=320... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Sun Mar 18 17:04:18 2007 @@ -347,10 +347,13 @@ { struct content *c; struct content_user *user_sentinel; - LOG(("url %s", url)); + c = talloc(0, struct content); if (!c) return 0; + + LOG(("url %s -> %p", url, c)); + user_sentinel = talloc(c, struct content_user); if (!user_sentinel) { talloc_free(c); @@ -528,7 +531,7 @@ assert(c->status == CONTENT_STATUS_TYPE_UNKNOWN); assert(type < CONTENT_UNKNOWN); - LOG(("content %s, type %i", c->url, type)); + LOG(("content %s (%p), type %i", c->url, c, type)); c->mime_type = talloc_strdup(c, mime_type); if (!c->mime_type) { @@ -721,7 +724,7 @@ assert(c->type < HANDLER_MAP_COUNT); assert(c->status == CONTENT_STATUS_LOADING); assert(!c->locked); - LOG(("content %s", c->url)); + LOG(("content %s (%p)", c->url, c)); if (c->source_allocated != c->source_size) { source_data = talloc_realloc(c, c->source_data, char, @@ -781,6 +784,7 @@ assert(c->status == CONTENT_STATUS_READY || c->status == CONTENT_STATUS_DONE); assert(!c->locked); + LOG(("%p %s", c, c->url)); c->locked = true; c->available_width = width; if (handler_map[c->type].reformat) { @@ -943,6 +947,7 @@ float scale, unsigned long background_colour) { assert(c != 0); + LOG(("%p %s", c, c->url)); if (c->locked) /* not safe to attempt redraw */ return true; @@ -970,6 +975,8 @@ int x0, y0, x1, y1; assert(c != 0); + + LOG(("%p %s", c, c->url)); if (c->locked) /* not safe to attempt redraw */ @@ -1036,8 +1043,8 @@ { struct content_user *user; - LOG(("content %s, user %p 0x%" PRIxPTR " 0x%" PRIxPTR, - c->url, callback, p1, p2)); + LOG(("content %s (%p), user %p 0x%" PRIxPTR " 0x%" PRIxPTR, + c->url, c, callback, p1, p2)); user = talloc(c, struct content_user); if (!user) return false; @@ -1088,8 +1095,8 @@ intptr_t p1, intptr_t p2) { struct content_user *user, *next; - LOG(("content %s, user %p 0x%" PRIxPTR " 0x%" PRIxPTR, - c->url, callback, p1, p2)); + LOG(("content %s (%p), user %p 0x%" PRIxPTR " 0x%" PRIxPTR, + c->url, c, callback, p1, p2)); /* user_list starts with a sentinel */ for (user = c->user_list; user->next != 0 && @@ -1117,6 +1124,7 @@ { struct content_user *user, *next; assert(c); + LOG(("%p %s -> %d", c, c->url, msg)); for (user = c->user_list->next; user != 0; user = next) { next = user->next; /* user may be destroyed during callback */ if (user->callback != 0) @@ -1202,7 +1210,7 @@ { assert(c != 0); assert(c->type < CONTENT_UNKNOWN); - LOG(("content %s", c->url)); + LOG(("content %p %s", c, c->url)); if (handler_map[c->type].open) handler_map[c->type].open(c, bw, page, index, box, params); } @@ -1218,7 +1226,7 @@ { assert(c != 0); assert(c->type < CONTENT_UNKNOWN); - LOG(("content %s", c->url)); + LOG(("content %p %s", c, c->url)); if (handler_map[c->type].close) handler_map[c->type].close(c); }

16 years

1
0
0 / 0

r3209 jmb - /trunk/netsurf/content/fetch.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 18 13:02:07 2007 New Revision: 3209 URL: http://svn.semichrome.net?rev=3209&view=rev Log: Handle redirects with partial bodies. Modified: trunk/netsurf/content/fetch.c Modified: trunk/netsurf/content/fetch.c URL: http://svn.semichrome.net/trunk/netsurf/content/fetch.c?rev=3209&r1=3208&... ============================================================================== --- trunk/netsurf/content/fetch.c (original) +++ trunk/netsurf/content/fetch.c Sun Mar 18 13:02:07 2007 @@ -915,6 +915,14 @@ ; /* redirect with no body or similar */ else finished = true; + } else if (result == CURLE_PARTIAL_FILE) { + /* CURLE_PARTIAL_FILE occurs if the received body of a + * response is smaller than that specified in the + * Content-Length header. */ + if (!f->had_headers && fetch_process_headers(f)) + ; /* redirect with partial body, or similar */ + else + error = true; } else if (result == CURLE_WRITE_ERROR && f->stopped) /* CURLE_WRITE_ERROR occurs when fetch_curl_data * returns 0, which we use to abort intentionally */

16 years

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits March 2007