Skip to content
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

Fix crash when attempting to load ancient languages via wasm #3068

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Fix crash when attempting to load ancient languages via wasm #3068

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion lib/binding_rust/wasm_language.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ impl fmt::Display for WasmError {
WasmErrorKind::Instantiate => "Failed to instantiate wasm module",
WasmErrorKind::Other => "Unknown error",
};
write!(f, "{kind} {}", self.message)
write!(f, "{kind}: {}", self.message)
}
}

Expand Down
5 changes: 4 additions & 1 deletion lib/src/language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ extern "C" {

#define ts_builtin_sym_error_repeat (ts_builtin_sym_error - 1)

#define LANGUAGE_VERSION_WITH_PRIMARY_STATES 14
#define LANGUAGE_VERSION_USABLE_VIA_WASM 13
amaanq marked this conversation as resolved.
Show resolved Hide resolved

typedef struct {
const TSParseAction *actions;
uint32_t action_count;
Expand Down Expand Up @@ -186,7 +189,7 @@ static inline bool ts_language_state_is_primary(
const TSLanguage *self,
TSStateId state
) {
if (self->version >= 14) {
if (self->version >= LANGUAGE_VERSION_WITH_PRIMARY_STATES) {
return state == self->primary_state_ids[state];
} else {
return true;
Expand Down
9 changes: 8 additions & 1 deletion lib/src/wasm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "./alloc.h"
#include "./array.h"
#include "./atomic.h"
#include "./language.h"
#include "./lexer.h"
#include "./wasm.h"
#include "./wasm/wasm-stdlib.h"
Expand Down Expand Up @@ -1057,6 +1058,12 @@ const TSLanguage *ts_wasm_store_load_language(
const uint8_t *memory = wasmtime_memory_data(context, &self->memory);
memcpy(&wasm_language, &memory[language_address], sizeof(LanguageInWasmMemory));

if (wasm_language.version < LANGUAGE_VERSION_USABLE_VIA_WASM) {
wasm_error->kind = TSWasmErrorKindInstantiate;
format(&wasm_error->message, "language version %u is too old for wasm", wasm_language.version);
goto error;
}

int32_t addresses[] = {
wasm_language.alias_map,
wasm_language.alias_sequences,
Expand Down Expand Up @@ -1188,7 +1195,7 @@ const TSLanguage *ts_wasm_store_load_language(
);
}

if (language->version >= 14) {
if (language->version >= LANGUAGE_VERSION_WITH_PRIMARY_STATES) {
language->primary_state_ids = copy(
&memory[wasm_language.primary_state_ids],
wasm_language.state_count * sizeof(TSStateId)
Expand Down