From 5dc0ee596300c3a2002e2593d5c39346cf00e7cb Mon Sep 17 00:00:00 2001 From: makamys Date: Tue, 7 Feb 2023 21:09:39 +0100 Subject: [PATCH] Add NPE protection to RemapperAdapter In 59db546c227bce4abaf75be1d89bf06067966e98, IRemapper's contract was changed so that mapMethodName and mapFieldName may be called with null arguments, but RemapperAdapterFML was not changed to be able to handle this, causing a NPE to happen in this case. This commit adds an opt-in way for RemapperAdapter implementations to request that the remapper should immediately no-op when invoked with null arguments, and makes RemapperAdapterFML use it. --- .../asm/bridge/RemapperAdapter.java | 20 +++++++++++++++++++ .../asm/bridge/RemapperAdapterFML.java | 1 + 2 files changed, 21 insertions(+) diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java index 216501c3..c373ac27 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java @@ -38,6 +38,8 @@ public abstract class RemapperAdapter implements IRemapper, IClassRemapper { protected final ILogger logger = MixinService.getService().getLogger("mixin"); protected final org.objectweb.asm.commons.Remapper remapper; + + protected boolean supportsNullArguments = true; public RemapperAdapter(Remapper remapper) { this.remapper = remapper; @@ -51,6 +53,9 @@ public abstract class RemapperAdapter implements IRemapper, IClassRemapper { @Override public String mapMethodName(String owner, String name, String desc) { this.logger.debug("{} is remapping method {}{} for {}", this, name, desc, owner); + if(!supportsNullArguments && (owner == null || name == null || desc == null)) { + return name; + } String newName = this.remapper.mapMethodName(owner, name, desc); if (!newName.equals(name)) { return newName; @@ -64,6 +69,9 @@ public abstract class RemapperAdapter implements IRemapper, IClassRemapper { @Override public String mapFieldName(String owner, String name, String desc) { this.logger.debug("{} is remapping field {}{} for {}", this, name, desc, owner); + if(!supportsNullArguments && (owner == null || name == null || desc == null)) { + return name; + } String newName = this.remapper.mapFieldName(owner, name, desc); if (!newName.equals(name)) { return newName; @@ -77,21 +85,33 @@ public abstract class RemapperAdapter implements IRemapper, IClassRemapper { @Override public String map(String typeName) { this.logger.debug("{} is remapping class {}", this, typeName); + if(typeName == null) { + return typeName; + } return this.remapper.map(typeName); } @Override public String unmap(String typeName) { + if(typeName == null) { + return typeName; + } return typeName; } @Override public String mapDesc(String desc) { + if(desc == null) { + return desc; + } return this.remapper.mapDesc(desc); } @Override public String unmapDesc(String desc) { + if(desc == null) { + return desc; + } String newDesc = ObfuscationUtil.unmapDescriptor(desc, this); return newDesc != null ? newDesc : desc; } diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java index 8aafa702..bacf3ad8 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java @@ -44,6 +44,7 @@ public final class RemapperAdapterFML extends RemapperAdapter { private RemapperAdapterFML(org.objectweb.asm.commons.Remapper remapper, Method mdUnmap) { super(remapper); + this.supportsNullArguments = false; this.logger.info("Initialised Mixin FML Remapper Adapter with {}", remapper); this.mdUnmap = mdUnmap; }