1 files changed, 3 insertions, 1 deletions

diff --git a/miscutils/bc.c b/miscutils/bc.c
index fe555d018..01402b311 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -2892,6 +2892,8 @@ static char peek_inbuf(void)
         ) {
                 xc_read_line(&G.input_buffer, G.prs.lex_input_fp);
                 G.prs.lex_inbuf = G.input_buffer.v;
+                // lex_next_at may point to now-freed data, update it:
+                G.prs.lex_next_at = G.prs.lex_inbuf;
                 if (G.input_buffer.len <= 1) // on EOF, len is 1 (NUL byte)
                         G.prs.lex_input_fp = NULL;
         }
@@ -3103,7 +3105,7 @@ static BC_STATUS zbc_lex_identifier(void)
                         continue;
  match:
                 // buf starts with keyword bc_lex_kws[i]
-                if (isalnum(buf[j]) || buf[j]=='_')
+                if (isalnum(buf[j]) || buf[j] == '_')
                         continue; // "ifz" does not match "if" keyword, "if." does
                 p->lex = BC_LEX_KEY_1st_keyword + i;
                 if (!keyword_is_POSIX(i)) {