Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/30ccc0698422f09f231807b64c00cb35597f5a64
...commit
http://git.netsurf-browser.org/netsurf.git/commit/30ccc0698422f09f231807b64c00cb35597f5a64
...tree
http://git.netsurf-browser.org/netsurf.git/tree/30ccc0698422f09f231807b64c00cb35597f5a64
The branch, master has been updated
via 30ccc0698422f09f231807b64c00cb35597f5a64 (commit)
from 0a8976156a037bc2ec2d4d10f33334ada36eac9d (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=30ccc0698422f09f231807b64c00cb35597f5a64
commit 30ccc0698422f09f231807b64c00cb35597f5a64
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix errors from cppcheck in amiga frontend
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index 47485e0..18d3a59 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -305,7 +305,7 @@ static void gui_download_window_error(struct
gui_download_window *dw,
static void ami_download_window_abort(void *w)
{
- struct gui_download_window *dw = (struct gui_download_window *)dw;
+ struct gui_download_window *dw = (struct gui_download_window *)w;
download_context_abort(dw->ctx);
dw->result = AMINS_DLOAD_ABORT;
gui_download_window_done(dw);
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 92617dd..a8d3aa9 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -110,6 +110,8 @@ void ami_drag_save(struct Window *win)
ULONG which = WBO_NONE, type;
char path[1025], dpath[1025];
+ path[0] = 0; /* ensure path is terminated */
+
ami_drag_icon_close(NULL);
ami_autoscroll = true;
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index e8a13d7..5e5efd5 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1035,6 +1035,7 @@ static void gui_init2(int argc, char** argv)
amiga_warn_user(messages_get_errorcode(error), 0);
}
free(temp_homepage_url);
+ temp_homepage_url = NULL;
}
if(cli_force == true) {
@@ -1115,6 +1116,7 @@ static void gui_init2(int argc, char** argv)
if(temp_homepage_url) {
sendcmd = ASPrintf("OPEN \"%s\" NEW%s",
temp_homepage_url, newtab);
free(temp_homepage_url);
+ temp_homepage_url = NULL;
} else {
sendcmd = ASPrintf("OPEN \"%s\" NEW%s",
nsoption_charp(homepage_url), newtab);
}
@@ -1566,6 +1568,7 @@ static struct IBox *ami_ns_rect_to_ibox(struct
gui_window_2 *gwin, const struct
if(ibox == NULL) return NULL;
if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox)
!= NSERROR_OK) {
+ free(ibox);
amiga_warn_user("NoMemory", "");
return NULL;
}
diff --git a/frontends/amiga/gui_menu.c b/frontends/amiga/gui_menu.c
index 6b9b207..0469dd5 100644
--- a/frontends/amiga/gui_menu.c
+++ b/frontends/amiga/gui_menu.c
@@ -504,9 +504,9 @@ HOOKF(void, ami_menu_item_arexx_entries, APTR, window,
struct IntuiMessage *)
DevNameFromLock(lock, temp, 1024, DN_FULLPATH);
AddPart(temp, script, 1024);
ami_arexx_execute(temp);
- free(temp);
UnLock(lock);
}
+ free(temp);
}
}
}
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 6521854..9de040d 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -336,7 +336,10 @@ static ULONG *amiga_icon_convertcolouricon32(UBYTE
*icondata, ULONG width, ULONG
if (!argbicon) return(NULL);
cmap=GetColorMap(pals1);
- if(!cmap) return(NULL);
+ if(!cmap) {
+ free(argbicon);
+ return(NULL);
+ }
for(i=0;i<(width*height);i++)
{
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/download.c | 2 +-
frontends/amiga/drag.c | 2 ++
frontends/amiga/gui.c | 3 +++
frontends/amiga/gui_menu.c | 2 +-
frontends/amiga/icon.c | 5 ++++-
5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index 47485e0..18d3a59 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -305,7 +305,7 @@ static void gui_download_window_error(struct
gui_download_window *dw,
static void ami_download_window_abort(void *w)
{
- struct gui_download_window *dw = (struct gui_download_window *)dw;
+ struct gui_download_window *dw = (struct gui_download_window *)w;
download_context_abort(dw->ctx);
dw->result = AMINS_DLOAD_ABORT;
gui_download_window_done(dw);
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 92617dd..a8d3aa9 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -110,6 +110,8 @@ void ami_drag_save(struct Window *win)
ULONG which = WBO_NONE, type;
char path[1025], dpath[1025];
+ path[0] = 0; /* ensure path is terminated */
+
ami_drag_icon_close(NULL);
ami_autoscroll = true;
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index e8a13d7..5e5efd5 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1035,6 +1035,7 @@ static void gui_init2(int argc, char** argv)
amiga_warn_user(messages_get_errorcode(error), 0);
}
free(temp_homepage_url);
+ temp_homepage_url = NULL;
}
if(cli_force == true) {
@@ -1115,6 +1116,7 @@ static void gui_init2(int argc, char** argv)
if(temp_homepage_url) {
sendcmd = ASPrintf("OPEN \"%s\" NEW%s",
temp_homepage_url, newtab);
free(temp_homepage_url);
+ temp_homepage_url = NULL;
} else {
sendcmd = ASPrintf("OPEN \"%s\" NEW%s",
nsoption_charp(homepage_url), newtab);
}
@@ -1566,6 +1568,7 @@ static struct IBox *ami_ns_rect_to_ibox(struct
gui_window_2 *gwin, const struct
if(ibox == NULL) return NULL;
if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox)
!= NSERROR_OK) {
+ free(ibox);
amiga_warn_user("NoMemory", "");
return NULL;
}
diff --git a/frontends/amiga/gui_menu.c b/frontends/amiga/gui_menu.c
index 6b9b207..0469dd5 100644
--- a/frontends/amiga/gui_menu.c
+++ b/frontends/amiga/gui_menu.c
@@ -504,9 +504,9 @@ HOOKF(void, ami_menu_item_arexx_entries, APTR, window,
struct IntuiMessage *)
DevNameFromLock(lock, temp, 1024, DN_FULLPATH);
AddPart(temp, script, 1024);
ami_arexx_execute(temp);
- free(temp);
UnLock(lock);
}
+ free(temp);
}
}
}
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c
index 6521854..9de040d 100644
--- a/frontends/amiga/icon.c
+++ b/frontends/amiga/icon.c
@@ -336,7 +336,10 @@ static ULONG *amiga_icon_convertcolouricon32(UBYTE
*icondata, ULONG width, ULONG
if (!argbicon) return(NULL);
cmap=GetColorMap(pals1);
- if(!cmap) return(NULL);
+ if(!cmap) {
+ free(argbicon);
+ return(NULL);
+ }
for(i=0;i<(width*height);i++)
{
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
