majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-31 08:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(translation): fix off-by-one crash in locale array and bounds check (#1725)

Browse Source 
the translations array was sized as Locale::last() (127) but needed
128 elements, causing out-of-bounds access for the last locale variant.
also added bounds check in reorder_substitutions to prevent panic when
% appears near the end of a translation string.

closes #1709
This commit is contained in:
Richard Marshall
2026-02-26 02:01:02 +00:00
committed by GitHub
parent 2c34328b62
commit c74a72a176
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pumpkin-util/src/translation.rs
View File

@@ -122,7 +122,7 @@ pub fn reorder_substitutions(
for (idx, &i) in indices.iter().enumerate() {
let mut num_chars = String::new();
let mut pos = 1;
while bytes[i + pos].is_ascii_digit() {
while i + pos < bytes.len() && bytes[i + pos].is_ascii_digit() {
num_chars.push(bytes[i + pos] as char);
pos += 1;
}
@@ -201,9 +201,9 @@ pub fn get_translation_text<P: Into<Cow<'static, str>>>(
result
}
pub static TRANSLATIONS: LazyLock<Mutex<[HashMap<String, String>; Locale::last() as usize]>> =
pub static TRANSLATIONS: LazyLock<Mutex<[HashMap<String, String>; Locale::COUNT]>> =
LazyLock::new(|| {
let mut array: [HashMap<String, String>; Locale::last() as usize] =
let mut array: [HashMap<String, String>; Locale::COUNT] =
std::array::from_fn(|_| HashMap::new());
let vanilla_en_us: HashMap<String, String> =
serde_json::from_str(VANILLA_EN_US_JSON).expect("Could not parse en_us.json.");
@@ -427,10 +427,7 @@ pub enum Locale {
}
impl Locale {
#[must_use]
pub const fn last() -> Self {
Self::ZlmArab
}
pub const COUNT: usize = Self::ZlmArab as usize + 1;
}
impl FromStr for Locale {