Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/e182a4d67c56aeb95179cde78886532665e0036b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/e182a4d67c56aeb95179cde78886532665e0036b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/e182a4d67c56aeb95179cde78886532665e0036b
The branch, master has been updated
via e182a4d67c56aeb95179cde78886532665e0036b (commit)
via e190cdf926a7ff4071053f8507e489cb8da63b13 (commit)
via 3217c82cdb4348960dfbdd978c68721f268fd385 (commit)
via 718da3ffffd1181a0b5b2d590214bc408ca44117 (commit)
from ca942e9e26cbd28ad5003b0e8bf29a771aafed94 (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=e182a4d67c56aeb95179cde78886532665e0036b
commit e182a4d67c56aeb95179cde78886532665e0036b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix memory leak in beos instantiate error path
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 5e386bd..7efdb59 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -608,8 +608,10 @@ NSBaseView::Instantiate(BMessage *archive)
struct replicant_thread_info *info = new replicant_thread_info;
info->url = BString(url);
- if (nsbeos_find_app_path(info->app) < B_OK)
+ if (nsbeos_find_app_path(info->app) < B_OK) {
+ delete info;
return NULL;
+ }
info->args[0] = info->app;
info->args[1] = (char *)info->url.String();
info->args[2] = NULL;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=e190cdf926a7ff4071053f8507e489cb8da63b13
commit e190cdf926a7ff4071053f8507e489cb8da63b13
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix uninitialised variable usage in atari ssl viewer
cppcheck identified uninitialised variable usage error
diff --git a/frontends/atari/verify_ssl.c b/frontends/atari/verify_ssl.c
index 055fd30..33136ee 100644
--- a/frontends/atari/verify_ssl.c
+++ b/frontends/atari/verify_ssl.c
@@ -182,8 +182,10 @@ static void do_popup( WINDOW *win, int index, int mode,
void *data)
-bool verify_ssl_form_do( const char * url, const struct ssl_cert_info *
cert_infos_n ,
- unsigned long num_certs )
+bool
+verify_ssl_form_do(const char * url,
+ const struct ssl_cert_info * cert_infos_n,
+ unsigned long num_certs)
{
OBJECT *tree;
WINDOW * form;
@@ -191,6 +193,13 @@ bool verify_ssl_form_do( const char * url, const struct
ssl_cert_info * cert_inf
bool bres = false;
bool cont = true;
int res = 0;
+
+ RsrcGaddr (h_gem_rsrc , R_TREE, VERIFY, &tree);
+ ObjcString( tree, VERIFY_LBL_HOST, (char*)url );
+ ObjcChange( OC_OBJC, tree, VERIFY_BT_ACCEPT, 0, 0 );
+ ObjcChange( OC_OBJC, tree, VERIFY_BT_REJECT, 0, 0 );
+ form = FormWindBegin( tree, (char*)"SSL Verify failed" );
+
dp.cert_infos_n = (struct ssl_cert_info *)cert_infos_n;
dp.num_certs = num_certs;
dp.scrollx = 0;
@@ -199,12 +208,6 @@ bool verify_ssl_form_do( const char * url, const struct
ssl_cert_info * cert_inf
dp.cols = cert_display_width( &dp.cert_infos_n[dp.current] );
dp.rows = 8;
dp.tree = tree;
-
- RsrcGaddr (h_gem_rsrc , R_TREE, VERIFY, &tree);
- ObjcString( tree, VERIFY_LBL_HOST, (char*)url );
- ObjcChange( OC_OBJC, tree, VERIFY_BT_ACCEPT, 0, 0 );
- ObjcChange( OC_OBJC, tree, VERIFY_BT_REJECT, 0, 0 );
- form = FormWindBegin( tree, (char*)"SSL Verify failed" );
EvntDataAdd( form, WM_REDRAW, cert_info_draw, (void*)&dp, EV_BOT );
/* this results in some extended objects which can not be freed: :( */
/* RsrcUserDraw( OC_FORM, tree, VERIFY_BOX_DETAILS,
cert_info_draw,(void*)&dp ) ; */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3217c82cdb4348960dfbdd978c68721f268fd385
commit 3217c82cdb4348960dfbdd978c68721f268fd385
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
attempt to remove unintended sign extension warning in fs backing store
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index bcb97d2..9d41065 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -1654,7 +1654,7 @@ static nserror store_write_block(struct store_state
*state,
state->blocks_opened = true;
}
- offst = bi << log2_block_size[elem_idx];
+ offst = (unsigned int)bi << log2_block_size[elem_idx];
wr = nsu_pwrite(state->blocks[elem_idx][bf].fd,
bse->elem[elem_idx].data,
@@ -1822,7 +1822,7 @@ static nserror store_read_block(struct store_state *state,
state->blocks_opened = true;
}
- offst = bi << log2_block_size[elem_idx];
+ offst = (unsigned int)bi << log2_block_size[elem_idx];
rd = nsu_pread(state->blocks[elem_idx][bf].fd,
bse->elem[elem_idx].data,
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=718da3ffffd1181a0b5b2d590214bc408ca44117
commit 718da3ffffd1181a0b5b2d590214bc408ca44117
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
make urldb internal parse macros less prone to control flow errors
fixes issue highlighted by coverity (CID 1361696)
diff --git a/content/urldb.c b/content/urldb.c
index 60944f7..c1c39c1 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -3796,7 +3796,7 @@ void urldb_load_cookies(const char *filename)
if (!fp)
return;
-#define FIND_T { \
+#define FIND_T do { \
for (; *p && *p != '\t'; p++) \
; /* do nothing */ \
if (p >= end) { \
@@ -3804,16 +3804,16 @@ void urldb_load_cookies(const char *filename)
continue; \
} \
*p++ = '\0'; \
-}
+ } while(0)
-#define SKIP_T { \
+#define SKIP_T do { \
for (; *p && *p == '\t'; p++) \
; /* do nothing */ \
if (p >= end) { \
LOG("Overran input"); \
continue; \
} \
-}
+ } while(0)
while (fgets(s, sizeof s, fp)) {
char *p = s, *end = 0,
-----------------------------------------------------------------------
Summary of changes:
content/fs_backing_store.c | 4 ++--
content/urldb.c | 8 ++++----
frontends/atari/verify_ssl.c | 19 +++++++++++--------
frontends/beos/scaffolding.cpp | 4 +++-
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c
index bcb97d2..9d41065 100644
--- a/content/fs_backing_store.c
+++ b/content/fs_backing_store.c
@@ -1654,7 +1654,7 @@ static nserror store_write_block(struct store_state
*state,
state->blocks_opened = true;
}
- offst = bi << log2_block_size[elem_idx];
+ offst = (unsigned int)bi << log2_block_size[elem_idx];
wr = nsu_pwrite(state->blocks[elem_idx][bf].fd,
bse->elem[elem_idx].data,
@@ -1822,7 +1822,7 @@ static nserror store_read_block(struct store_state *state,
state->blocks_opened = true;
}
- offst = bi << log2_block_size[elem_idx];
+ offst = (unsigned int)bi << log2_block_size[elem_idx];
rd = nsu_pread(state->blocks[elem_idx][bf].fd,
bse->elem[elem_idx].data,
diff --git a/content/urldb.c b/content/urldb.c
index 60944f7..c1c39c1 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -3796,7 +3796,7 @@ void urldb_load_cookies(const char *filename)
if (!fp)
return;
-#define FIND_T { \
+#define FIND_T do { \
for (; *p && *p != '\t'; p++) \
; /* do nothing */ \
if (p >= end) { \
@@ -3804,16 +3804,16 @@ void urldb_load_cookies(const char *filename)
continue; \
} \
*p++ = '\0'; \
-}
+ } while(0)
-#define SKIP_T { \
+#define SKIP_T do { \
for (; *p && *p == '\t'; p++) \
; /* do nothing */ \
if (p >= end) { \
LOG("Overran input"); \
continue; \
} \
-}
+ } while(0)
while (fgets(s, sizeof s, fp)) {
char *p = s, *end = 0,
diff --git a/frontends/atari/verify_ssl.c b/frontends/atari/verify_ssl.c
index 055fd30..33136ee 100644
--- a/frontends/atari/verify_ssl.c
+++ b/frontends/atari/verify_ssl.c
@@ -182,8 +182,10 @@ static void do_popup( WINDOW *win, int index, int mode,
void *data)
-bool verify_ssl_form_do( const char * url, const struct ssl_cert_info *
cert_infos_n ,
- unsigned long num_certs )
+bool
+verify_ssl_form_do(const char * url,
+ const struct ssl_cert_info * cert_infos_n,
+ unsigned long num_certs)
{
OBJECT *tree;
WINDOW * form;
@@ -191,6 +193,13 @@ bool verify_ssl_form_do( const char * url, const struct
ssl_cert_info * cert_inf
bool bres = false;
bool cont = true;
int res = 0;
+
+ RsrcGaddr (h_gem_rsrc , R_TREE, VERIFY, &tree);
+ ObjcString( tree, VERIFY_LBL_HOST, (char*)url );
+ ObjcChange( OC_OBJC, tree, VERIFY_BT_ACCEPT, 0, 0 );
+ ObjcChange( OC_OBJC, tree, VERIFY_BT_REJECT, 0, 0 );
+ form = FormWindBegin( tree, (char*)"SSL Verify failed" );
+
dp.cert_infos_n = (struct ssl_cert_info *)cert_infos_n;
dp.num_certs = num_certs;
dp.scrollx = 0;
@@ -199,12 +208,6 @@ bool verify_ssl_form_do( const char * url, const struct
ssl_cert_info * cert_inf
dp.cols = cert_display_width( &dp.cert_infos_n[dp.current] );
dp.rows = 8;
dp.tree = tree;
-
- RsrcGaddr (h_gem_rsrc , R_TREE, VERIFY, &tree);
- ObjcString( tree, VERIFY_LBL_HOST, (char*)url );
- ObjcChange( OC_OBJC, tree, VERIFY_BT_ACCEPT, 0, 0 );
- ObjcChange( OC_OBJC, tree, VERIFY_BT_REJECT, 0, 0 );
- form = FormWindBegin( tree, (char*)"SSL Verify failed" );
EvntDataAdd( form, WM_REDRAW, cert_info_draw, (void*)&dp, EV_BOT );
/* this results in some extended objects which can not be freed: :( */
/* RsrcUserDraw( OC_FORM, tree, VERIFY_BOX_DETAILS,
cert_info_draw,(void*)&dp ) ; */
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index 5e386bd..7efdb59 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -608,8 +608,10 @@ NSBaseView::Instantiate(BMessage *archive)
struct replicant_thread_info *info = new replicant_thread_info;
info->url = BString(url);
- if (nsbeos_find_app_path(info->app) < B_OK)
+ if (nsbeos_find_app_path(info->app) < B_OK) {
+ delete info;
return NULL;
+ }
info->args[0] = info->app;
info->args[1] = (char *)info->url.String();
info->args[2] = NULL;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
