wash/bshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse: lex: fix memory leaks

Browse Source
This commit is contained in:
max 🍓
2026-05-30 19:50:38 +01:00
parent fec3be2140
commit 5d6f2a5ce8
4 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bshell.runtime/parse/lex/lex-internal.h
+1 -1
View File
@@ -107,7 +107,7 @@ extern struct bshell_lex_state *lex_state_push(
struct bshell_lex_ctx *ctx, struct bshell_lex_ctx *ctx,
enum bshell_lex_state_id state_type, enum bshell_lex_state_id state_type,
enum state_flags flags); enum state_flags flags);
extern void lex_state_pop(struct bshell_lex_ctx *ctx); extern void lex_state_pop(struct bshell_lex_ctx *ctx, bool no_preserve_root);
extern struct bshell_lex_state *lex_state_get(struct bshell_lex_ctx *ctx); extern struct bshell_lex_state *lex_state_get(struct bshell_lex_ctx *ctx);
extern void lex_state_change( extern void lex_state_change(
struct bshell_lex_ctx *ctx, struct bshell_lex_ctx *ctx,
bshell.runtime/parse/lex/lex.c
+12 -5
View File
@@ -198,11 +198,14 @@ struct bshell_lex_state *lex_state_push(
return state; return state;
} }
void lex_state_pop(struct bshell_lex_ctx *ctx) void lex_state_pop(struct bshell_lex_ctx *ctx, bool no_preserve_root)
{ {
fx_queue_entry *entry = fx_queue_last(&ctx->lex_state); fx_queue_entry *entry = fx_queue_last(&ctx->lex_state);
if (!entry || !fx_queue_prev(entry)) { if (!entry) {
/* don't pop if this is the root state */ return;
}
if (!no_preserve_root && !fx_queue_prev(entry)) {
return; return;
} }
@@ -451,6 +454,10 @@ enum bshell_status bshell_lex_ctx_cleanup(struct bshell_lex_ctx *ctx)
fx_string_unref(ctx->lex_tmp); fx_string_unref(ctx->lex_tmp);
} }
while (!fx_queue_empty(&ctx->lex_state)) {
lex_state_pop(ctx, true);
}
memset(ctx, 0x0, sizeof *ctx); memset(ctx, 0x0, sizeof *ctx);
return BSHELL_SUCCESS; return BSHELL_SUCCESS;
} }
@@ -1228,7 +1235,7 @@ static bool do_lex_state_transition(
if (!recursive) { if (!recursive) {
for (unsigned int i = 0; i < state->s_nr_terminators; i++) { for (unsigned int i = 0; i < state->s_nr_terminators; i++) {
if (state->s_terminators[i] == token) { if (state->s_terminators[i] == token) {
lex_state_pop(ctx); lex_state_pop(ctx, false);
return true; return true;
} }
} }
@@ -1275,7 +1282,7 @@ static bool do_lex_state_transition(
const struct bshell_lex_state_link *link = best_matches[i]; const struct bshell_lex_state_link *link = best_matches[i];
switch (link->l_type) { switch (link->l_type) {
case BSHELL_LEX_STATE_LINK_POP: case BSHELL_LEX_STATE_LINK_POP:
lex_state_pop(ctx); lex_state_pop(ctx, false);
result = true; result = true;
break; break;
case BSHELL_LEX_STATE_LINK_PUSH: { case BSHELL_LEX_STATE_LINK_PUSH: {
bshell.runtime/parse/lex/word.c
+7 -5
View File
@@ -21,7 +21,7 @@ static enum bshell_status word_symbol(struct bshell_lex_ctx *ctx)
lex_state_push(ctx, BSHELL_LEX_STATE_STATEMENT, 0); lex_state_push(ctx, BSHELL_LEX_STATE_STATEMENT, 0);
return BSHELL_SUCCESS; return BSHELL_SUCCESS;
case BSHELL_SYM_RIGHT_PAREN: case BSHELL_SYM_RIGHT_PAREN:
lex_state_pop(ctx); lex_state_pop(ctx, false);
status = push_symbol(ctx, sym->id); status = push_symbol(ctx, sym->id);
if (status != BSHELL_SUCCESS) { if (status != BSHELL_SUCCESS) {
@@ -92,7 +92,8 @@ static enum bshell_status word_content(struct bshell_lex_ctx *ctx)
static enum bshell_status word_begin(struct bshell_lex_ctx *ctx) static enum bshell_status word_begin(struct bshell_lex_ctx *ctx)
{ {
struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_WORD_START); struct bshell_lex_token *tok
= bshell_lex_token_create(BSHELL_TOK_WORD_START);
if (!tok) { if (!tok) {
return BSHELL_ERR_NO_MEMORY; return BSHELL_ERR_NO_MEMORY;
} }
@@ -107,7 +108,8 @@ static enum bshell_status word_begin(struct bshell_lex_ctx *ctx)
static enum bshell_status word_end(struct bshell_lex_ctx *ctx) static enum bshell_status word_end(struct bshell_lex_ctx *ctx)
{ {
struct bshell_lex_token *tok = bshell_lex_token_create(BSHELL_TOK_WORD_END); struct bshell_lex_token *tok
= bshell_lex_token_create(BSHELL_TOK_WORD_END);
if (!tok) { if (!tok) {
return BSHELL_ERR_NO_MEMORY; return BSHELL_ERR_NO_MEMORY;
} }
@@ -121,12 +123,12 @@ static enum bshell_status word_pump_token(struct bshell_lex_ctx *ctx)
fx_wchar c = peek_char(ctx); fx_wchar c = peek_char(ctx);
if (fx_wchar_is_space(c)) { if (fx_wchar_is_space(c)) {
lex_state_pop(ctx); lex_state_pop(ctx, false);
return BSHELL_SUCCESS; return BSHELL_SUCCESS;
} }
if (char_has_flags(ctx, c, BSHELL_LEX_TOKEN_TERMINATES_WORD)) { if (char_has_flags(ctx, c, BSHELL_LEX_TOKEN_TERMINATES_WORD)) {
lex_state_pop(ctx); lex_state_pop(ctx, false);
return BSHELL_SUCCESS; return BSHELL_SUCCESS;
} }
bshell.runtime/parse/token.c
+2
View File
@@ -41,6 +41,8 @@ void bshell_lex_token_destroy(struct bshell_lex_token *tok)
switch (tok->tok_type) { switch (tok->tok_type) {
case BSHELL_TOK_WORD: case BSHELL_TOK_WORD:
case BSHELL_TOK_FLAG: case BSHELL_TOK_FLAG:
case BSHELL_TOK_VAR:
case BSHELL_TOK_VAR_SPLAT:
case BSHELL_TOK_STRING: case BSHELL_TOK_STRING:
if (tok->tok_str) { if (tok->tok_str) {
free(tok->tok_str); free(tok->tok_str);