emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: fix signed char expansion bug

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-12-12 17:39:12 +01:00
parent b6afcc7819
commit 2fe66b1d2d
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
shell/ash.c
View File

@ -3113,7 +3113,18 @@ static const uint8_t syntax_index_table[] ALIGN1 = {
# endif # endif
}; };
#if 1
# define SIT(c, syntax) ((S_I_T[syntax_index_table[c]] >> ((syntax)*4)) & 0xf) # define SIT(c, syntax) ((S_I_T[syntax_index_table[c]] >> ((syntax)*4)) & 0xf)
#else /* debug version, caught one signed char bug */
# define SIT(c, syntax) \
({ \
if ((c) < 0 || (c) > (PEOF + ENABLE_ASH_ALIAS)) \
bb_error_msg_and_die("line:%d c:%d", __LINE__, (c)); \
if ((syntax) < 0 || (syntax) > (2 + ENABLE_SH_MATH_SUPPORT)) \
bb_error_msg_and_die("line:%d c:%d", __LINE__, (c)); \
((S_I_T[syntax_index_table[c]] >> ((syntax)*4)) & 0xf); \
})
#endif
#endif /* !USE_SIT_FUNCTION */ #endif /* !USE_SIT_FUNCTION */
@ -5869,14 +5880,15 @@ memtodest(const char *p, size_t len, int syntax, int quotes)
do { do {
unsigned char c = *p++; unsigned char c = *p++;
if (c) { if (c) {
int n = SIT(c, syntax); if (quotes & QUOTES_ESC) {
if ((quotes & QUOTES_ESC) int n = SIT(c, syntax);
&& ((n == CCTL) if (n == CCTL
|| (((quotes & EXP_FULL) || syntax != BASESYNTAX) || (((quotes & EXP_FULL) || syntax != BASESYNTAX)
&& n == CBACK) && n == CBACK
) )
) { ) {
USTPUTC(CTLESC, q); USTPUTC(CTLESC, q);
}
} }
} else if (!(quotes & QUOTES_KEEPNUL)) } else if (!(quotes & QUOTES_KEEPNUL))
continue; continue;
@ -10051,7 +10063,7 @@ pgetc(void)
return g_parsefile->lastc[--g_parsefile->unget]; return g_parsefile->lastc[--g_parsefile->unget];
if (--g_parsefile->left_in_line >= 0) if (--g_parsefile->left_in_line >= 0)
c = (signed char)*g_parsefile->next_to_pgetc++; c = (unsigned char)*g_parsefile->next_to_pgetc++;
else else
c = preadbuffer(); c = preadbuffer();