Expand mitigation to cover potential impact from CVE-2021-45046 and o…

…ther code paths
FabricMC · Dec 14, 2021 · e5ea712 · e5ea712
1 parent c208118
commit e5ea712
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/Log4jLogHandler.java b/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/Log4jLogHandler.java
@@ -103,7 +103,7 @@ private static boolean needsLookupRemoval() {
 		if (version == null) return true;
 
 		try {
-			return Version.parse(version).compareTo(Version.parse("2.10")) < 0; // 2.10+ supports the log4j2.formatMsgNoLookups system property or doesn't lookup by default
+			return Version.parse(version).compareTo(Version.parse("2.16")) < 0; // 2.15+ doesn't lookup by default, but we patch anything up to 2.16 just in case
 		} catch (VersionParsingException e) {
 			Log.warn(LogCategory.GAME_PROVIDER, "Can't parse Log4J2 Manifest version %s", version, e);
 			return true;

diff --git a/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java b/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
@@ -71,7 +71,7 @@ public final class FabricLoaderImpl extends net.fabricmc.loader.FabricLoader {
 
 	public static final int ASM_VERSION = Opcodes.ASM9;
 
-	public static final String VERSION = "0.12.11";
+	public static final String VERSION = "0.12.12";
 	public static final String MOD_ID = "fabricloader";
 
 	public static final String CACHE_DIR_NAME = ".fabric"; // relative to game dir