Skip to content

Just abort on OOM for lex mode #4267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kddnewton merged 1 commit into from
Oct 13, 2026
Merged

Just abort on OOM for lex mode #4267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/prism.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,28 +205,29 @@ lex_mode_terminator(const uint8_t start) {
* space of the lex state stack, then we'll just use a new slot. Otherwise we'll
* allocate a new pointer and use that.
*/
static bool
static void
lex_mode_push(pm_parser_t *parser, pm_lex_mode_t lex_mode) {
lex_mode.prev = parser->lex_modes.current;
parser->lex_modes.index++;

if (parser->lex_modes.index > PM_LEX_STACK_SIZE - 1) {
parser->lex_modes.current = (pm_lex_mode_t *) xmalloc(sizeof(pm_lex_mode_t));
if (parser->lex_modes.current == NULL) return false;
if (PRISM_UNLIKELY(parser->lex_modes.current == NULL)) {
fprintf(stderr, "prism: out of memory; aborting\n");
abort();
}

*parser->lex_modes.current = lex_mode;
} else {
parser->lex_modes.stack[parser->lex_modes.index] = lex_mode;
parser->lex_modes.current = &parser->lex_modes.stack[parser->lex_modes.index];
}

return true;
}

/**
* Push on a new list lex mode.
*/
static PRISM_INLINE bool
static PRISM_INLINE void
lex_mode_push_list(pm_parser_t *parser, bool interpolation, uint8_t delimiter) {
uint8_t incrementor = lex_mode_incrementor(delimiter);
uint8_t terminator = lex_mode_terminator(delimiter);
Expand Down Expand Up @@ -268,23 +269,23 @@ lex_mode_push_list(pm_parser_t *parser, bool interpolation, uint8_t delimiter) {
}

parser->explicit_encoding = NULL;
return lex_mode_push(parser, lex_mode);
lex_mode_push(parser, lex_mode);
}

/**
* Push on a new list lex mode that is only used for compatibility. This is
* called when we're at the end of the file. We want the parser to be able to
* perform its normal error tolerance.
*/
static PRISM_INLINE bool
static PRISM_INLINE void
lex_mode_push_list_eof(pm_parser_t *parser) {
return lex_mode_push_list(parser, false, '\0');
lex_mode_push_list(parser, false, '\0');
}

/**
* Push on a new regexp lex mode.
*/
static PRISM_INLINE bool
static PRISM_INLINE void
lex_mode_push_regexp(pm_parser_t *parser, uint8_t incrementor, uint8_t terminator) {
pm_lex_mode_t lex_mode = {
.mode = PM_LEX_REGEXP,
Expand Down Expand Up @@ -314,13 +315,13 @@ lex_mode_push_regexp(pm_parser_t *parser, uint8_t incrementor, uint8_t terminato
}

parser->explicit_encoding = NULL;
return lex_mode_push(parser, lex_mode);
lex_mode_push(parser, lex_mode);
}

/**
* Push on a new string lex mode.
*/
static PRISM_INLINE bool
static PRISM_INLINE void
lex_mode_push_string(pm_parser_t *parser, bool interpolation, bool label_allowed, uint8_t incrementor, uint8_t terminator) {
pm_lex_mode_t lex_mode = {
.mode = PM_LEX_STRING,
Expand Down Expand Up @@ -359,17 +360,17 @@ lex_mode_push_string(pm_parser_t *parser, bool interpolation, bool label_allowed
}

parser->explicit_encoding = NULL;
return lex_mode_push(parser, lex_mode);
lex_mode_push(parser, lex_mode);
}

/**
* Push on a new string lex mode that is only used for compatibility. This is
* called when we're at the end of the file. We want the parser to be able to
* perform its normal error tolerance.
*/
static PRISM_INLINE bool
static PRISM_INLINE void
lex_mode_push_string_eof(pm_parser_t *parser) {
return lex_mode_push_string(parser, false, false, '\0', '\0');
lex_mode_push_string(parser, false, false, '\0', '\0');
}

/**
Expand Down
Loading