Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions apps/meta-generator/src/import/extract/mojang.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,42 @@ async fn make_version_manifest(
.into_iter()
.flat_map(crate::import::mojang::patch_library)
.collect();
disable_base64_intrinsics(&mut manifest);

Ok((sha256, manifest))
}

// CVE-2026-114938
const DISABLE_BASE64_INTRINSICS: &str = "-XX:-UseBASE64Intrinsics";

/// Disables base64 intrinsics for Java 17+ (CVE-2026-114938)
fn disable_base64_intrinsics(manifest: &mut mojang::VersionManifest) {
let requires_modern_java = manifest
.java_version
.as_ref()
// The CVE fix is only relevant for Java 17+, but the launcher will just
// use Java 17 for versions requiring Java 16.
.is_some_and(|java| java.major_version >= 16);
if !requires_modern_java {
return;
}
let Some(jvm_arguments) = manifest
.arguments
.as_mut()
.and_then(|arguments| arguments.get_mut(&mojang::ArgumentType::Jvm))
else {
return;
};
let already_present = jvm_arguments.iter().any(|argument| {
matches!(argument, mojang::Argument::Normal(value) if value == DISABLE_BASE64_INTRINSICS)
});
if !already_present {
jvm_arguments.push(mojang::Argument::Normal(
DISABLE_BASE64_INTRINSICS.to_string(),
));
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
13 changes: 13 additions & 0 deletions packages/app-lib/src/launcher/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ pub fn get_jvm_arguments(
memory: MemorySettings,
custom_args: Vec<String>,
java_arch: &str,
java_major_version: u32,
quick_play_type: &QuickPlayType,
quick_play_version: QuickPlayVersion,
log_config: Option<&LoggingConfiguration>,
Expand Down Expand Up @@ -192,6 +193,14 @@ pub fn get_jvm_arguments(
]);
}

if java_major_version >= MIN_JAVA_FOR_BASE64_INTRINSICS_FLAG
&& !parsed_arguments
.iter()
.any(|arg| arg == DISABLE_BASE64_INTRINSICS)
{
parsed_arguments.push(DISABLE_BASE64_INTRINSICS.to_string());
}

for arg in custom_args {
if !arg.is_empty() {
parsed_arguments.push(arg);
Expand All @@ -201,6 +210,10 @@ pub fn get_jvm_arguments(
Ok(parsed_arguments)
}

// CVE-2026-114938
const DISABLE_BASE64_INTRINSICS: &str = "-XX:-UseBASE64Intrinsics";
const MIN_JAVA_FOR_BASE64_INTRINSICS_FLAG: u32 = 17;

fn parse_jvm_argument(
mut argument: String,
natives_path: &Path,
Expand Down
1 change: 1 addition & 0 deletions packages/app-lib/src/launcher/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1150,6 +1150,7 @@ pub async fn launch_minecraft(
*memory,
Vec::from(java_args),
&java_version.architecture,
java_version.parsed_version,
&quick_play_type,
quick_play_version,
version_info
Expand Down
Loading