aboutsummaryrefslogtreecommitdiff
path: root/toys/pending
diff options
context:
space:
mode:
authorAriadne Conill <ariadne@dereferenced.org>2020-07-05 00:19:31 -0600
committerRob Landley <rob@landley.net>2020-07-05 04:43:47 -0500
commit66f80c83e376b31f4b1ffed36ced7b2729423f6a (patch)
treebcb2631b065538982b9af2d785a25d0e70139349 /toys/pending
parent63073aa6e16ebd0aa96e000847cb13fb0eb352fe (diff)
downloadtoybox-66f80c83e376b31f4b1ffed36ced7b2729423f6a.tar.gz
wget: do not append toybox version at runtime
The sprintf() call, while technically valid (17 bytes fits in an 18 byte allocation) trips Alpine fortify-headers due to checking for allocations that could potentially overrun. The call is pointless anyway -- as we are appending a constant to another constant, it is better to just let the compiler do so and calculate the size. This is supported by ISO C89 and later, and thus any compiler that would be used to compile toybox. Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
Diffstat (limited to 'toys/pending')
-rw-r--r--toys/pending/wget.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/toys/pending/wget.c b/toys/pending/wget.c
index 21d44466..75fad3f4 100644
--- a/toys/pending/wget.c
+++ b/toys/pending/wget.c
@@ -135,7 +135,7 @@ void wget_main(void)
FILE *fp;
ssize_t len, body_len;
char *body, *result, *rc, *r_str, *redir_loc = 0;
- char ua[18] = "toybox wget", hostname[1024], port[6], path[1024];
+ char ua[] = "toybox wget/" TOYBOX_VERSION, hostname[1024], port[6], path[1024];
// TODO extract filename to be saved from URL
if (!(toys.optflags & FLAG_O)) help_exit("no filename");
@@ -144,7 +144,6 @@ void wget_main(void)
if(!toys.optargs[0]) help_exit("no URL");
get_info(toys.optargs[0], hostname, port, path);
- sprintf(ua+11, "/%s", TOYBOX_VERSION);
for (;; redirects--) {
sock = conn_svr(hostname, port);
// compose HTTP request