Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/155c0c568f56012b624ae7000200e6f2d270ce50
...commit
http://git.netsurf-browser.org/netsurf.git/commit/155c0c568f56012b624ae7000200e6f2d270ce50
...tree
http://git.netsurf-browser.org/netsurf.git/tree/155c0c568f56012b624ae7000200e6f2d270ce50
The branch, chris/amissl has been updated
via 155c0c568f56012b624ae7000200e6f2d270ce50 (commit)
via 446fd392e85fa8ac527c2e1938889ea0781cca6d (commit)
via 6455a2ea83493165641be350e3dfe1dd93af5dea (commit)
via 826474a1a3707bb837bb1b1aa687d4981acd914d (commit)
from f70c0fa6266a2d7afae95c43e6c96c00033944e5 (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=155c0c568f56012b624ae7000200e6f2d270ce50
commit 155c0c568f56012b624ae7000200e6f2d270ce50
Merge: f70c0fa 446fd39
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into
chris/amissl
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/imagemap.c | 8 ++++----
content/handlers/image/svg.c | 2 +-
frontends/amiga/schedule.c | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/content/handlers/html/imagemap.c b/content/handlers/html/imagemap.c
index d26ba5f..0c35768 100644
--- a/content/handlers/html/imagemap.c
+++ b/content/handlers/html/imagemap.c
@@ -376,14 +376,14 @@ imagemap_addtolist(const struct html_content *c,
}
if (target != NULL) {
- /* Copy target into the map */
+ /* Copy target dom string into the map data */
new_map->target = malloc(dom_string_byte_length(target) + 1);
if (new_map->target == NULL)
goto bad_out;
- strncpy(new_map->target,
- dom_string_data(target),
- dom_string_byte_length(target));
+ memcpy(new_map->target,
+ dom_string_data(target),
+ dom_string_byte_length(target));
new_map->target[dom_string_byte_length(target)] = 0;
}
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index 5126073..9972249 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -189,7 +189,7 @@ svg_redraw_internal(struct content *c,
for (i = 0; i != diagram->shape_count; i++) {
if (diagram->shape[i].path) {
pstyle.stroke_width = plot_style_int_to_fixed(
- diagram->shape[i].stroke);
+ diagram->shape[i].stroke_width);
pstyle.stroke_colour = BGR(diagram->shape[i].stroke);
pstyle.fill_colour = BGR(diagram->shape[i].fill);
res = ctx->plot->path(ctx,
diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c
index 043edc7..2d2da38 100644
--- a/frontends/amiga/schedule.c
+++ b/frontends/amiga/schedule.c
@@ -336,6 +336,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void
*p)
ASOIOR_Duplicate,
tioreq,
TAG_DONE);
#else
+ if(schedule_msgport == NULL) return NSERROR_NOMEM;
nscb = (struct nscallback *)CreateIORequest(schedule_msgport,
sizeof(struct nscallback));
*nscb = *tioreq;
#endif
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
