Gitweb links:

...log 
http://git.netsurf-browser.org/netsurf.git/shortlog/68e8152f3eb95395cd47e0d703ed709e4ddaef89
...commit 
http://git.netsurf-browser.org/netsurf.git/commit/68e8152f3eb95395cd47e0d703ed709e4ddaef89
...tree 
http://git.netsurf-browser.org/netsurf.git/tree/68e8152f3eb95395cd47e0d703ed709e4ddaef89

The branch, master has been updated
       via  68e8152f3eb95395cd47e0d703ed709e4ddaef89 (commit)
       via  8f9a652774bbf1bdb469e0e7280a28983559b90d (commit)
      from  ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108 (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=68e8152f3eb95395cd47e0d703ed709e4ddaef89
commit 68e8152f3eb95395cd47e0d703ed709e4ddaef89
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Ensure OpenURL list is always freed

diff --git a/frontends/amiga/launch.c b/frontends/amiga/launch.c
index 31800ef..10c32ae 100755
--- a/frontends/amiga/launch.c
+++ b/frontends/amiga/launch.c
@@ -74,19 +74,19 @@ static void ami_openurl_free_list(struct MinList *list)
        struct ami_protocol *node;
        struct ami_protocol *nnode;
 
-       if(IsMinListEmpty(list)) return;
-       node = (struct ami_protocol *)GetHead((struct List *)list);
-
-       do
-       {
-               nnode=(struct ami_protocol *)GetSucc((struct Node *)node);
+       if(IsMinListEmpty(list) == NULL) {
+               node = (struct ami_protocol *)GetHead((struct List *)list);
 
-               Remove((struct Node *)node);
-               if (node->protocol) lwc_string_unref(node->protocol);
-               free(node);
-               node = NULL;
-       }while((node=nnode));
+               do
+               {
+                       nnode=(struct ami_protocol *)GetSucc((struct Node 
*)node);
 
+                       Remove((struct Node *)node);
+                       if (node->protocol) lwc_string_unref(node->protocol);
+                       free(node);
+                       node = NULL;
+               }while((node=nnode));
+       }
        free(list);
 }
 


commitdiff 
http://git.netsurf-browser.org/netsurf.git/commit/?id=8f9a652774bbf1bdb469e0e7280a28983559b90d
commit 8f9a652774bbf1bdb469e0e7280a28983559b90d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Revert "Ensure we free the pen list memory"
    
    This reverts commit 74d7c2d2c2b2161701c1f0258bbfc7feb753ac1e.

diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 7c8e8d6..6bae634 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -273,21 +273,20 @@ void ami_plot_release_pens(struct MinList *shared_pens)
        struct ami_plot_pen *nnode;
 
        if(shared_pens == NULL) return;
-       if(IsMinListEmpty(shared_pens) == NULL) {
-               node = (struct ami_plot_pen *)GetHead((struct List 
*)shared_pens);
+       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));
 
-               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)


-----------------------------------------------------------------------

Summary of changes:
 frontends/amiga/launch.c   |   22 +++++++++++-----------
 frontends/amiga/plotters.c |   19 +++++++++----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/frontends/amiga/launch.c b/frontends/amiga/launch.c
index 31800ef..10c32ae 100755
--- a/frontends/amiga/launch.c
+++ b/frontends/amiga/launch.c
@@ -74,19 +74,19 @@ static void ami_openurl_free_list(struct MinList *list)
        struct ami_protocol *node;
        struct ami_protocol *nnode;
 
-       if(IsMinListEmpty(list)) return;
-       node = (struct ami_protocol *)GetHead((struct List *)list);
-
-       do
-       {
-               nnode=(struct ami_protocol *)GetSucc((struct Node *)node);
+       if(IsMinListEmpty(list) == NULL) {
+               node = (struct ami_protocol *)GetHead((struct List *)list);
 
-               Remove((struct Node *)node);
-               if (node->protocol) lwc_string_unref(node->protocol);
-               free(node);
-               node = NULL;
-       }while((node=nnode));
+               do
+               {
+                       nnode=(struct ami_protocol *)GetSucc((struct Node 
*)node);
 
+                       Remove((struct Node *)node);
+                       if (node->protocol) lwc_string_unref(node->protocol);
+                       free(node);
+                       node = NULL;
+               }while((node=nnode));
+       }
        free(list);
 }
 
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index 7c8e8d6..6bae634 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -273,21 +273,20 @@ void ami_plot_release_pens(struct MinList *shared_pens)
        struct ami_plot_pen *nnode;
 
        if(shared_pens == NULL) return;
-       if(IsMinListEmpty(shared_pens) == NULL) {
-               node = (struct ami_plot_pen *)GetHead((struct List 
*)shared_pens);
+       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));
 
-               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

Reply via email to