traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3068 from tree-sitter/load-old-language-via-wasm-crash

Browse source 
Fix crash when attempting to load ancient languages via wasm
This commit is contained in:
Max Brunsfeld 2024-02-23 12:24:01 -08:00 • committed by GitHub
commit 9301c1e676
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/binding_rust/wasm_language.rs
View file

@ -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)
}
}

5
lib/src/language.h
View file

@ -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
typedef struct {
const TSParseAction *actions;
uint32_t action_count;
@ -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;

9
lib/src/wasm.c
View file

@ -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"
@ -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,
@ -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)