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

bc: stop checking for name length in bc_lex_name()

Browse Source 
Gigabyte-long names are not a practical concern.

function                                             old     new   delta
bc_lex_name                                           73      69      -4
bc_lex_token                                        1266    1259      -7
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-11)             Total: -11 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-12-10 20:26:04 +01:00
parent fa35e598ab
commit 88cfea6a81
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
miscutils/bc.c
View File

@ -3020,27 +3020,34 @@ static BcStatus bc_lex_number(BcLex *l, char start)
# define bc_lex_number(...) (bc_lex_number(__VA_ARGS__), BC_STATUS_SUCCESS) # define bc_lex_number(...) (bc_lex_number(__VA_ARGS__), BC_STATUS_SUCCESS)
#endif #endif
static BcStatus bc_lex_name(BcLex *l) static void bc_lex_name(BcLex *l)
{ {
size_t i = 0; size_t i;
const char *buf = l->buf + l->i - 1; const char *buf;
char c = buf[i];
l->t.t = BC_LEX_NAME; l->t.t = BC_LEX_NAME;
while ((c >= 'a' && c <= 'z') || isdigit(c) || c == '_') c = buf[++i]; i = 0;
buf = l->buf + l->i - 1;
for (;;) {
char c = buf[i];
if ((c < 'a' || c > 'z') && !isdigit(c) && c != '_') break;
i++;
}
#if 0 // We do not protect against people with gigabyte-long names
// This check makes sense only if size_t is (much) larger than BC_MAX_STRING. // This check makes sense only if size_t is (much) larger than BC_MAX_STRING.
if (SIZE_MAX > (BC_MAX_STRING | 0xff)) { if (SIZE_MAX > (BC_MAX_STRING | 0xff)) {
if (i > BC_MAX_STRING) if (i > BC_MAX_STRING)
return bc_error("name too long: must be [1,"BC_MAX_STRING_STR"]"); return bc_error("name too long: must be [1,"BC_MAX_STRING_STR"]");
} }
#endif
bc_vec_string(&l->t.v, i, buf); bc_vec_string(&l->t.v, i, buf);
// Increment the index. We minus 1 because it has already been incremented. // Increment the index. We minus 1 because it has already been incremented.
l->i += i - 1; l->i += i - 1;
return BC_STATUS_SUCCESS; //return BC_STATUS_SUCCESS;
} }
static void bc_lex_init(BcLex *l, BcLexNext next) static void bc_lex_init(BcLex *l, BcLexNext next)
@ -3121,8 +3128,7 @@ static BcStatus bc_lex_identifier(BcLex *l)
return BC_STATUS_SUCCESS; return BC_STATUS_SUCCESS;
} }
s = bc_lex_name(l); bc_lex_name(l);
if (s) return s;
if (l->t.v.len > 2) { if (l->t.v.len > 2) {
// Prevent this: // Prevent this:
@ -3498,7 +3504,7 @@ static BcStatus dc_lex_register(BcLex *l)
if (!G_exreg) if (!G_exreg)
s = bc_error("extended register"); s = bc_error("extended register");
else else
s = bc_lex_name(l); bc_lex_name(l);
} }
else { else {
bc_vec_pop_all(&l->t.v); bc_vec_pop_all(&l->t.v);
@ -3509,6 +3515,9 @@ static BcStatus dc_lex_register(BcLex *l)
return s; return s;
} }
#if ERRORS_ARE_FATAL
# define dc_lex_register(...) (dc_lex_register(__VA_ARGS__), BC_STATUS_SUCCESS)
#endif
static BcStatus dc_lex_string(BcLex *l) static BcStatus dc_lex_string(BcLex *l)
{ {
@ -3545,6 +3554,9 @@ static BcStatus dc_lex_string(BcLex *l)
return BC_STATUS_SUCCESS; return BC_STATUS_SUCCESS;
} }
#if ERRORS_ARE_FATAL
# define dc_lex_string(...) (dc_lex_string(__VA_ARGS__), BC_STATUS_SUCCESS)
#endif
static FAST_FUNC BcStatus dc_lex_token(BcLex *l) static FAST_FUNC BcStatus dc_lex_token(BcLex *l)
{ {