Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108
...commit
http://git.netsurf-browser.org/netsurf.git/commit/ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108
...tree
http://git.netsurf-browser.org/netsurf.git/tree/ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108
The branch, master has been updated
via ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108 (commit)
via 74d7c2d2c2b2161701c1f0258bbfc7feb753ac1e (commit)
via a440907b78f430ff7428e48f6fb0532db5f00cd5 (commit)
from c0a15de1e4609e942c037c340c5fed3c5bce839d (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=ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108
commit ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Free the correct memory pointer
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 7d13349..a9a882e 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -54,7 +54,7 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_create(s) ((APTR)1)
#define ami_memory_itempool_delete(p) ((void)0)
#define ami_memory_itempool_alloc(p,s) malloc(s)
-#define ami_memory_itempool_free(p,i,s) free(p)
+#define ami_memory_itempool_free(p,i,s) free(i)
#endif
/* clib2 slab allocator */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=74d7c2d2c2b2161701c1f0258bbfc7feb753ac1e
commit 74d7c2d2c2b2161701c1f0258bbfc7feb753ac1e
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Ensure we free the pen list memory
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 6bae634..7c8e8d6 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -273,20 +273,21 @@ void ami_plot_release_pens(struct MinList *shared_pens)
struct ami_plot_pen *nnode;
if(shared_pens == NULL) return;
- if(IsMinListEmpty(shared_pens)) return;
- node = (struct ami_plot_pen *)GetHead((struct List *)shared_pens);
-
- do {
- nnode = (struct ami_plot_pen *)GetSucc((struct Node *)node);
- ReleasePen(scrn->ViewPort.ColorMap, node->pen);
- Remove((struct Node *)node);
- ami_memory_itempool_free(pool_pens, node, sizeof(struct
ami_plot_pen));
- } while((node = nnode));
+ if(IsMinListEmpty(shared_pens) == NULL) {
+ node = (struct ami_plot_pen *)GetHead((struct List
*)shared_pens);
+ do {
+ nnode = (struct ami_plot_pen *)GetSucc((struct Node
*)node);
+ ReleasePen(scrn->ViewPort.ColorMap, node->pen);
+ Remove((struct Node *)node);
+ ami_memory_itempool_free(pool_pens, node, sizeof(struct
ami_plot_pen));
+ } while((node = nnode));
+ }
glob->apen = 0x00000000;
glob->open = 0x00000000;
glob->apen_num = -1;
glob->open_num = -1;
+ free(shared_pens);
}
static void ami_plot_setapen(struct RastPort *rp, ULONG colr)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=a440907b78f430ff7428e48f6fb0532db5f00cd5
commit a440907b78f430ff7428e48f6fb0532db5f00cd5
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix memory leak
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 236aed6..bff034c 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -285,6 +285,7 @@ STRPTR ami_locale_langs(int *codeset)
acceptlangs = ASPrintf("%s",
remapped);
}
}
+ if(remapped != NULL) free(remapped);
}
else
{
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/gui.c | 1 +
frontends/amiga/memory.h | 2 +-
frontends/amiga/plotters.c | 19 ++++++++++---------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 236aed6..bff034c 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -285,6 +285,7 @@ STRPTR ami_locale_langs(int *codeset)
acceptlangs = ASPrintf("%s",
remapped);
}
}
+ if(remapped != NULL) free(remapped);
}
else
{
diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h
index 7d13349..a9a882e 100644
--- a/frontends/amiga/memory.h
+++ b/frontends/amiga/memory.h
@@ -54,7 +54,7 @@ void *ami_memory_clear_alloc(size_t size, UBYTE value);
#define ami_memory_itempool_create(s) ((APTR)1)
#define ami_memory_itempool_delete(p) ((void)0)
#define ami_memory_itempool_alloc(p,s) malloc(s)
-#define ami_memory_itempool_free(p,i,s) free(p)
+#define ami_memory_itempool_free(p,i,s) free(i)
#endif
/* clib2 slab allocator */
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 6bae634..7c8e8d6 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -273,20 +273,21 @@ void ami_plot_release_pens(struct MinList *shared_pens)
struct ami_plot_pen *nnode;
if(shared_pens == NULL) return;
- if(IsMinListEmpty(shared_pens)) return;
- node = (struct ami_plot_pen *)GetHead((struct List *)shared_pens);
-
- do {
- nnode = (struct ami_plot_pen *)GetSucc((struct Node *)node);
- ReleasePen(scrn->ViewPort.ColorMap, node->pen);
- Remove((struct Node *)node);
- ami_memory_itempool_free(pool_pens, node, sizeof(struct
ami_plot_pen));
- } while((node = nnode));
+ if(IsMinListEmpty(shared_pens) == NULL) {
+ node = (struct ami_plot_pen *)GetHead((struct List
*)shared_pens);
+ do {
+ nnode = (struct ami_plot_pen *)GetSucc((struct Node
*)node);
+ ReleasePen(scrn->ViewPort.ColorMap, node->pen);
+ Remove((struct Node *)node);
+ ami_memory_itempool_free(pool_pens, node, sizeof(struct
ami_plot_pen));
+ } while((node = nnode));
+ }
glob->apen = 0x00000000;
glob->open = 0x00000000;
glob->apen_num = -1;
glob->open_num = -1;
+ free(shared_pens);
}
static void ami_plot_setapen(struct RastPort *rp, ULONG colr)
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
