Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/05ac4303058588a77b12e25951d378498a9b3449
...commit
http://git.netsurf-browser.org/netsurf.git/commit/05ac4303058588a77b12e25951d378498a9b3449
...tree
http://git.netsurf-browser.org/netsurf.git/tree/05ac4303058588a77b12e25951d378498a9b3449
The branch, master has been updated
via 05ac4303058588a77b12e25951d378498a9b3449 (commit)
via 7264ff6f4da719671eb170cb23d80d7fe4c2d1fe (commit)
via 3fd6f04e520872efa19ba2a9fd22b324d8104f2e (commit)
via 0bd66d4d040fdd5dc3894069720ba338541251cd (commit)
via 5b235b519589b830c55e65b7ff5412ee62028d91 (commit)
via d5d16346758cf28e1f0263e87d56ce75a7913c2a (commit)
from c1e1df42e2821e3713d808c4d2a171d94326d175 (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=05ac4303058588a77b12e25951d378498a9b3449
commit 05ac4303058588a77b12e25951d378498a9b3449
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
ensure filename numeric is not truncated and hence cause output buffer
overflow
diff --git a/utils/filename.c b/utils/filename.c
index f0e1bb0..00ade74 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -96,7 +96,9 @@ const char *filename_request(void)
else
dir->high_used |= (1 << (i - 32));
- sprintf(filename_buffer, "%s%.2i", dir->prefix, i);
+ i = i % 99;
+
+ snprintf(filename_buffer, sizeof(filename_buffer), "%s%.2i",
dir->prefix, i);
return filename_buffer;
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7264ff6f4da719671eb170cb23d80d7fe4c2d1fe
commit 7264ff6f4da719671eb170cb23d80d7fe4c2d1fe
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
ensure url buffer is sufficient to not truncate output
diff --git a/content/urldb.c b/content/urldb.c
index 4bdb10e..c4a5a6b 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -2969,7 +2969,7 @@ nserror urldb_load(const char *filename)
for (i = 0; i < urls; i++) {
struct path_data *p = NULL;
char scheme[64], ports[10];
- char url[64 + 3 + 256 + 6 + 4096 + 1];
+ char url[64 + 3 + 256 + 6 + 4096 + 1 + 1];
unsigned int port;
bool is_file = false;
nsurl *nsurl;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3fd6f04e520872efa19ba2a9fd22b324d8104f2e
commit 3fd6f04e520872efa19ba2a9fd22b324d8104f2e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
ensure output buffer is large enough to not be truncated
diff --git a/utils/time.c b/utils/time.c
index 71fa30f..e1f76ca 100644
--- a/utils/time.c
+++ b/utils/time.c
@@ -109,7 +109,7 @@ static const char * const months[NSC_TIME_MONTH__COUNT] = {
/* exported interface documented in utils/time.h */
const char *rfc1123_date(time_t t)
{
- static char ret[30];
+ static char ret[31];
struct tm *tm = gmtime(&t);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0bd66d4d040fdd5dc3894069720ba338541251cd
commit 0bd66d4d040fdd5dc3894069720ba338541251cd
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix helper script apt packaging to work with buster
diff --git a/docs/env.sh b/docs/env.sh
index b9adb92..39513cf 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -36,7 +36,10 @@ fi
# apt get commandline to install necessary dev packages
ns-apt-get-install()
{
- if /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then
+ LIBCURL_OPENSSL_CONFLICTS="$(/usr/bin/apt-cache show libcurl4-openssl-dev
| grep Conflicts | grep -o libssl1.0-dev)"
+ if [ "x${LIBCURL_OPENSSL_CONFLICTS}" != "x" ]; then
+ NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
+ elif /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then
NS_DEV_DEB="${NS_DEV_DEB} libssl1.0-dev"
else
NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5b235b519589b830c55e65b7ff5412ee62028d91
commit 5b235b519589b830c55e65b7ff5412ee62028d91
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix logging level in duktape binding
diff --git a/content/handlers/javascript/duktape/dukky.c
b/content/handlers/javascript/duktape/dukky.c
index e08a657..a519ae0 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -658,12 +658,12 @@ bool js_exec(jscontext *ctx, const char *txt, size_t
txtlen)
(void) nsu_getmonotonic_ms(&ctx->exec_start_time);
duk_push_string(CTX, "?unknown source?");
if (duk_pcompile_lstring_filename(CTX, DUK_COMPILE_EVAL, txt, txtlen)
!= 0) {
- NSLOG(netsurf, WARN, "Failed to compile JavaScript input");
+ NSLOG(netsurf, WARNING, "Failed to compile JavaScript input");
goto handle_error;
}
if (duk_pcall(CTX, 0/*nargs*/) == DUK_EXEC_ERROR) {
- NSLOG(netsurf, WARN, "Failed to execute JavaScript");
+ NSLOG(netsurf, WARNING, "Failed to execute JavaScript");
goto handle_error;
}
@@ -678,15 +678,15 @@ handle_error:
} else {
#define GETTER(what) \
if (duk_has_prop_string(CTX, 0, what)) { \
- NSLOG(netsurf, WARN, "Fetching " what); \
+ NSLOG(netsurf, WARNING, "Fetching " what); \
duk_dup(CTX, 0); \
if (duk_safe_call(CTX, dukky_safe_get, (void *)what, 1,
1) != DUK_EXEC_SUCCESS) { \
- NSLOG(netsurf, WARN, "Error fetching " what ":
%s", duk_safe_to_string(CTX, -1)); \
+ NSLOG(netsurf, WARNING, "Error fetching " what
": %s", duk_safe_to_string(CTX, -1)); \
} else { \
- NSLOG(netsurf, WARN, "Success fetching " what);
\
+ NSLOG(netsurf, WARNING, "Success fetching "
what); \
} \
} else { \
- NSLOG(netsurf, WARN, "Faking " what); \
+ NSLOG(netsurf, WARNING, "Faking " what);
\
duk_push_string(CTX, "?" what "?"); \
}
GETTER("name");
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d5d16346758cf28e1f0263e87d56ce75a7913c2a
commit d5d16346758cf28e1f0263e87d56ce75a7913c2a
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix gcc version parameter ordering for gcc 8
diff --git a/Makefile b/Makefile
index 0b6388a..f685252 100644
--- a/Makefile
+++ b/Makefile
@@ -319,7 +319,7 @@ else
endif
# compiler versioning to adjust warning flags
-CC_VERSION := $(shell $(CC) -dumpversion -dumpfullversion)
+CC_VERSION := $(shell $(CC) -dumpfullversion -dumpversion)
CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION)))
CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION)))
define cc_ver_ge
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
content/handlers/javascript/duktape/dukky.c | 12 ++++++------
content/urldb.c | 2 +-
docs/env.sh | 5 ++++-
utils/filename.c | 4 +++-
utils/time.c | 2 +-
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 0b6388a..f685252 100644
--- a/Makefile
+++ b/Makefile
@@ -319,7 +319,7 @@ else
endif
# compiler versioning to adjust warning flags
-CC_VERSION := $(shell $(CC) -dumpversion -dumpfullversion)
+CC_VERSION := $(shell $(CC) -dumpfullversion -dumpversion)
CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION)))
CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION)))
define cc_ver_ge
diff --git a/content/handlers/javascript/duktape/dukky.c
b/content/handlers/javascript/duktape/dukky.c
index e08a657..a519ae0 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -658,12 +658,12 @@ bool js_exec(jscontext *ctx, const char *txt, size_t
txtlen)
(void) nsu_getmonotonic_ms(&ctx->exec_start_time);
duk_push_string(CTX, "?unknown source?");
if (duk_pcompile_lstring_filename(CTX, DUK_COMPILE_EVAL, txt, txtlen)
!= 0) {
- NSLOG(netsurf, WARN, "Failed to compile JavaScript input");
+ NSLOG(netsurf, WARNING, "Failed to compile JavaScript input");
goto handle_error;
}
if (duk_pcall(CTX, 0/*nargs*/) == DUK_EXEC_ERROR) {
- NSLOG(netsurf, WARN, "Failed to execute JavaScript");
+ NSLOG(netsurf, WARNING, "Failed to execute JavaScript");
goto handle_error;
}
@@ -678,15 +678,15 @@ handle_error:
} else {
#define GETTER(what) \
if (duk_has_prop_string(CTX, 0, what)) { \
- NSLOG(netsurf, WARN, "Fetching " what); \
+ NSLOG(netsurf, WARNING, "Fetching " what); \
duk_dup(CTX, 0); \
if (duk_safe_call(CTX, dukky_safe_get, (void *)what, 1,
1) != DUK_EXEC_SUCCESS) { \
- NSLOG(netsurf, WARN, "Error fetching " what ":
%s", duk_safe_to_string(CTX, -1)); \
+ NSLOG(netsurf, WARNING, "Error fetching " what
": %s", duk_safe_to_string(CTX, -1)); \
} else { \
- NSLOG(netsurf, WARN, "Success fetching " what);
\
+ NSLOG(netsurf, WARNING, "Success fetching "
what); \
} \
} else { \
- NSLOG(netsurf, WARN, "Faking " what); \
+ NSLOG(netsurf, WARNING, "Faking " what);
\
duk_push_string(CTX, "?" what "?"); \
}
GETTER("name");
diff --git a/content/urldb.c b/content/urldb.c
index 4bdb10e..c4a5a6b 100644
--- a/content/urldb.c
+++ b/content/urldb.c
@@ -2969,7 +2969,7 @@ nserror urldb_load(const char *filename)
for (i = 0; i < urls; i++) {
struct path_data *p = NULL;
char scheme[64], ports[10];
- char url[64 + 3 + 256 + 6 + 4096 + 1];
+ char url[64 + 3 + 256 + 6 + 4096 + 1 + 1];
unsigned int port;
bool is_file = false;
nsurl *nsurl;
diff --git a/docs/env.sh b/docs/env.sh
index b9adb92..39513cf 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -36,7 +36,10 @@ fi
# apt get commandline to install necessary dev packages
ns-apt-get-install()
{
- if /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then
+ LIBCURL_OPENSSL_CONFLICTS="$(/usr/bin/apt-cache show libcurl4-openssl-dev
| grep Conflicts | grep -o libssl1.0-dev)"
+ if [ "x${LIBCURL_OPENSSL_CONFLICTS}" != "x" ]; then
+ NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
+ elif /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then
NS_DEV_DEB="${NS_DEV_DEB} libssl1.0-dev"
else
NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
diff --git a/utils/filename.c b/utils/filename.c
index f0e1bb0..00ade74 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -96,7 +96,9 @@ const char *filename_request(void)
else
dir->high_used |= (1 << (i - 32));
- sprintf(filename_buffer, "%s%.2i", dir->prefix, i);
+ i = i % 99;
+
+ snprintf(filename_buffer, sizeof(filename_buffer), "%s%.2i",
dir->prefix, i);
return filename_buffer;
}
diff --git a/utils/time.c b/utils/time.c
index 71fa30f..e1f76ca 100644
--- a/utils/time.c
+++ b/utils/time.c
@@ -109,7 +109,7 @@ static const char * const months[NSC_TIME_MONTH__COUNT] = {
/* exported interface documented in utils/time.h */
const char *rfc1123_date(time_t t)
{
- static char ret[30];
+ static char ret[31];
struct tm *tm = gmtime(&t);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
