Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db726ae0c6 | ||
|
|
bb61205290 | ||
|
|
56a335378a | ||
|
|
5b939a6d29 | ||
|
|
d326be2850 | ||
|
|
bcc5b0e6ca | ||
|
|
611bbfc148 | ||
|
|
23dd1c75b7 | ||
|
|
89358a7131 | ||
|
|
39b71881b8 | ||
|
|
67cc582d42 | ||
|
|
ee1e0987e4 |
No files matched your search
@@ -1,6 +1,6 @@
|
||||
VERSION = 1
|
||||
PATCHLEVEL = 33
|
||||
SUBLEVEL = 0
|
||||
SUBLEVEL = 2
|
||||
EXTRAVERSION =
|
||||
NAME = Unnamed
|
||||
|
||||
|
||||
@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = {
|
||||
* each table.
|
||||
* t: table to free
|
||||
*/
|
||||
#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
|
||||
#define ERR_RET ((huft_t*)(uintptr_t)1)
|
||||
static void huft_free(huft_t *p)
|
||||
{
|
||||
huft_t *q;
|
||||
|
||||
/*
|
||||
* If 'p' has the error bit set we have to clear it, otherwise we might run
|
||||
* into a segmentation fault or an invalid pointer to free(p)
|
||||
*/
|
||||
if (BAD_HUFT(p)) {
|
||||
p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET));
|
||||
}
|
||||
|
||||
/* Go through linked list, freeing from the malloced (t[-1]) address. */
|
||||
while (p) {
|
||||
q = (--p)->v.t;
|
||||
@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current
|
||||
* or a valid pointer to a Huffman table, ORed with 0x1 if incompete table
|
||||
* is given: "fixed inflate" decoder feeds us such data.
|
||||
*/
|
||||
#define BAD_HUFT(p) ((uintptr_t)(p) & 1)
|
||||
#define ERR_RET ((huft_t*)(uintptr_t)1)
|
||||
static huft_t* huft_build(const unsigned *b, const unsigned n,
|
||||
const unsigned s, const struct cp_ext *cp_ext,
|
||||
unsigned *m)
|
||||
|
||||
@@ -290,8 +290,11 @@ unpack_lzma_stream(transformer_state_t *xstate)
|
||||
uint32_t pos;
|
||||
|
||||
pos = buffer_pos - rep0;
|
||||
if ((int32_t)pos < 0)
|
||||
if ((int32_t)pos < 0) {
|
||||
pos += header.dict_size;
|
||||
if ((int32_t)pos < 0)
|
||||
goto bad;
|
||||
}
|
||||
match_byte = buffer[pos];
|
||||
do {
|
||||
int bit;
|
||||
|
||||
@@ -48,7 +48,7 @@ static void check_selinux_update_passwd(const char *username)
|
||||
bb_simple_error_msg_and_die("SELinux: access denied");
|
||||
}
|
||||
if (ENABLE_FEATURE_CLEAN_UP)
|
||||
freecon(context);
|
||||
freecon(seuser);
|
||||
}
|
||||
#else
|
||||
# define check_selinux_update_passwd(username) ((void)0)
|
||||
|
||||
+3
-3
@@ -1871,7 +1871,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
|
||||
send_headers(HTTP_OK);
|
||||
#if ENABLE_FEATURE_USE_SENDFILE
|
||||
{
|
||||
off_t offset = range_start;
|
||||
off_t offset = (range_start < 0) ? 0 : range_start;
|
||||
while (1) {
|
||||
/* sz is rounded down to 64k */
|
||||
ssize_t sz = MAXINT(ssize_t) - 0xffff;
|
||||
@@ -2486,8 +2486,8 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
|
||||
if (STRNCASECMP(iobuf, "Range:") == 0) {
|
||||
/* We know only bytes=NNN-[MMM] */
|
||||
char *s = skip_whitespace(iobuf + sizeof("Range:")-1);
|
||||
if (is_prefixed_with(s, "bytes=")) {
|
||||
s += sizeof("bytes=")-1;
|
||||
s = is_prefixed_with(s, "bytes=");
|
||||
if (s) {
|
||||
range_start = BB_STRTOOFF(s, &s, 10);
|
||||
if (s[0] != '-' || range_start < 0) {
|
||||
range_start = -1;
|
||||
|
||||
@@ -896,7 +896,7 @@ traceroute_init(int op, char **argv)
|
||||
|
||||
op |= getopt32(argv, "^"
|
||||
OPT_STRING
|
||||
"\0" "-1:x-x" /* minimum 1 arg */
|
||||
"\0" "-1" /* minimum 1 arg */
|
||||
, &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
|
||||
, &source, &waittime_str, &pausemsecs_str, &first_ttl_str
|
||||
);
|
||||
|
||||
+7
-9
@@ -7011,7 +7011,8 @@ subevalvar(char *start, char *str, int strloc,
|
||||
slash_pos = -1;
|
||||
if (repl) {
|
||||
slash_pos = expdest - ((char *)stackblock() + strloc);
|
||||
STPUTC('/', expdest);
|
||||
if (!(flag & EXP_DISCARD))
|
||||
STPUTC('/', expdest);
|
||||
//bb_error_msg("repl+1:'%s'", repl + 1);
|
||||
p = argstr(repl + 1, (flag & EXP_DISCARD) | EXP_TILDE); /* EXP_TILDE: echo "${v/x/~}" expands ~ ! */
|
||||
*repl = '/';
|
||||
@@ -12634,7 +12635,7 @@ parsesub: {
|
||||
do {
|
||||
STPUTC(c, out);
|
||||
c = pgetc_eatbnl();
|
||||
} while (!subtype && isdigit(c));
|
||||
} while ((subtype == 0 || subtype == VSLENGTH) && isdigit(c));
|
||||
} else if (c != '}') {
|
||||
/* $[{[#]]<specialchar>[}] */
|
||||
int cc = c;
|
||||
@@ -12664,11 +12665,6 @@ parsesub: {
|
||||
} else
|
||||
goto badsub;
|
||||
|
||||
if (c != '}' && subtype == VSLENGTH) {
|
||||
/* ${#VAR didn't end with } */
|
||||
goto badsub;
|
||||
}
|
||||
|
||||
if (subtype == 0) {
|
||||
static const char types[] ALIGN1 = "}-+?=";
|
||||
/* ${VAR...} but not $VAR or ${#VAR} */
|
||||
@@ -12725,6 +12721,8 @@ parsesub: {
|
||||
#endif
|
||||
}
|
||||
} else {
|
||||
if (subtype == VSLENGTH && c != '}')
|
||||
subtype = 0;
|
||||
badsub:
|
||||
pungetc();
|
||||
}
|
||||
@@ -14499,7 +14497,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
|
||||
|
||||
if (sflag || minusc == NULL) {
|
||||
#if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
|
||||
if (iflag) {
|
||||
if (line_input_state) {
|
||||
const char *hp = lookupvar("HISTFILE");
|
||||
if (!hp) {
|
||||
hp = lookupvar("HOME");
|
||||
@@ -14513,7 +14511,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
|
||||
}
|
||||
}
|
||||
if (hp)
|
||||
line_input_state->hist_file = hp;
|
||||
line_input_state->hist_file = xstrdup(hp);
|
||||
# if ENABLE_FEATURE_SH_HISTFILESIZE
|
||||
hp = lookupvar("HISTFILESIZE");
|
||||
line_input_state->max_history = size_from_HISTFILESIZE(hp);
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
SHELL: line 1: : not found
|
||||
Executable
+2
@@ -0,0 +1,2 @@
|
||||
# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
|
||||
$THIS_SH -c '\' SHELL
|
||||
@@ -0,0 +1 @@
|
||||
SHELL: line 1: -: not found
|
||||
Executable
+2
@@ -0,0 +1,2 @@
|
||||
# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
|
||||
$THIS_SH -c '"-"' SHELL
|
||||
@@ -1,2 +1,3 @@
|
||||
|
||||
|
||||
Ok:0
|
||||
@@ -1,3 +1,5 @@
|
||||
unset v
|
||||
echo ${v/*/w}
|
||||
v=''
|
||||
echo ${v/*/w}
|
||||
echo Ok:$?
|
||||
+16
-1
@@ -3694,9 +3694,10 @@ static void debug_print_tree(struct pipe *pi, int lvl)
|
||||
|
||||
pin = 0;
|
||||
while (pi) {
|
||||
fdprintf(2, "%*spipe %d %sres_word=%s followup=%d %s\n",
|
||||
fdprintf(2, "%*spipe %d #cmds:%d %sres_word=%s followup=%d %s\n",
|
||||
lvl*2, "",
|
||||
pin,
|
||||
pi->num_cmds,
|
||||
(IF_HAS_KEYWORDS(pi->pi_inverted ? "! " :) ""),
|
||||
RES[pi->res_word],
|
||||
pi->followup, PIPE[pi->followup]
|
||||
@@ -3839,6 +3840,9 @@ static void done_pipe(struct parse_context *ctx, pipe_style type)
|
||||
#endif
|
||||
/* Replace all pipes in ctx with one newly created */
|
||||
ctx->list_head = ctx->pipe = pi;
|
||||
/* for cases like "cmd && &", do not be tricked by last command
|
||||
* being null - the entire {...} & is NOT null! */
|
||||
not_null = 1;
|
||||
} else {
|
||||
no_conv:
|
||||
ctx->pipe->followup = type;
|
||||
@@ -5235,6 +5239,11 @@ static int encode_string(o_string *as_string,
|
||||
}
|
||||
#endif
|
||||
o_addQchr(dest, ch);
|
||||
if (ch == SPECIAL_VAR_SYMBOL) {
|
||||
/* Convert "^C" to corresponding special variable reference */
|
||||
o_addchr(dest, SPECIAL_VAR_QUOTED_SVS);
|
||||
o_addchr(dest, SPECIAL_VAR_SYMBOL);
|
||||
}
|
||||
goto again;
|
||||
#undef as_string
|
||||
}
|
||||
@@ -5346,6 +5355,11 @@ static struct pipe *parse_stream(char **pstring,
|
||||
if (ch == '\n')
|
||||
continue; /* drop \<newline>, get next char */
|
||||
nommu_addchr(&ctx.as_string, '\\');
|
||||
if (ch == SPECIAL_VAR_SYMBOL) {
|
||||
nommu_addchr(&ctx.as_string, ch);
|
||||
/* Convert \^C to corresponding special variable reference */
|
||||
goto case_SPECIAL_VAR_SYMBOL;
|
||||
}
|
||||
o_addchr(&ctx.word, '\\');
|
||||
if (ch == EOF) {
|
||||
/* Testcase: eval 'echo Ok\' */
|
||||
@@ -5670,6 +5684,7 @@ static struct pipe *parse_stream(char **pstring,
|
||||
/* Note: nommu_addchr(&ctx.as_string, ch) is already done */
|
||||
|
||||
switch (ch) {
|
||||
case_SPECIAL_VAR_SYMBOL:
|
||||
case SPECIAL_VAR_SYMBOL:
|
||||
/* Convert raw ^C to corresponding special variable reference */
|
||||
o_addchr(&ctx.word, SPECIAL_VAR_SYMBOL);
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
hush: can't execute '': No such file or directory
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
|
||||
$THIS_SH -c '\' SHELL
|
||||
@@ -0,0 +1 @@
|
||||
hush: can't execute '-': No such file or directory
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
# (set argv0 to "SHELL" to avoid "/path/to/shell: blah" in error messages)
|
||||
$THIS_SH -c '"-"' SHELL
|
||||
+13
-4
@@ -8,14 +8,23 @@
|
||||
|
||||
# Damaged encrypted streams
|
||||
testing "unlzma (bad archive 1)" \
|
||||
"unlzma <unlzma_issue_1.lzma >/dev/null; echo \$?" \
|
||||
"1
|
||||
"unlzma <unlzma_issue_1.lzma 2>&1 >/dev/null; echo \$?" \
|
||||
"unlzma: corrupted data
|
||||
1
|
||||
" "" ""
|
||||
|
||||
# Damaged encrypted streams
|
||||
testing "unlzma (bad archive 2)" \
|
||||
"unlzma <unlzma_issue_2.lzma >/dev/null; echo \$?" \
|
||||
"1
|
||||
"unlzma <unlzma_issue_2.lzma 2>&1 >/dev/null; echo \$?" \
|
||||
"unlzma: corrupted data
|
||||
1
|
||||
" "" ""
|
||||
|
||||
# Damaged encrypted streams
|
||||
testing "unlzma (bad archive 3)" \
|
||||
"unlzma <unlzma_issue_3.lzma 2>&1 >/dev/null; echo \$?" \
|
||||
"unlzma: corrupted data
|
||||
1
|
||||
" "" ""
|
||||
|
||||
exit $FAILCOUNT
|
||||
Binary file not shown.
Reference in new issue
Block a user