filter out malformed skin images

Author: moehreag

1.16_combat-6/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java

@@ -62,6 +62,7 @@ public Skin read(Path p) {
 				byteBuffer.put(in);
 				byteBuffer.rewind();
 				try (var img = NativeImage.read(byteBuffer)) {
+					if (img.getWidth() != 64 || img.getHeight() != 64) return null;
 					slim = (ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0);
 				}
 			}

1.20/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java

@@ -55,6 +55,7 @@ public Skin read(Path p) {
 			var in = Files.readAllBytes(p);
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var img = NativeImage.read(in)) {
+				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
 				slim = (ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0);
 			}
 			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);

1.21.7/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java

@@ -55,6 +55,7 @@ public Skin read(Path p) {
 			var in = Files.readAllBytes(p);
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var img = NativeImage.read(in)) {
+				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
 				slim = ClientColors.ARGB.alpha(img.getPixel(47, 63)) == 0;
 			}
 			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);

1.21/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java

@@ -55,7 +55,8 @@ public Skin read(Path p) {
 			var in = Files.readAllBytes(p);
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var img = NativeImage.read(in)) {
-				slim = (ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0);
+				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
+				slim = ClientColors.ARGB.alpha(img.getPixelColor(47, 63)) == 0;
 			}
 			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);
 		} catch (Exception e) {

1.8.9/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManagementScreen.java

@@ -96,7 +96,7 @@ public void render(int mouseX, int mouseY, float delta) {
 		tooltip = null;
 		super.render(mouseX, mouseY, delta);
 		if (tooltip != null) {
-			renderTooltip(tooltip, mouseX, mouseY+20);
+			renderTooltip(tooltip, mouseX, mouseY + 20);
 			Lighting.turnOff();
 		}
 	}
@@ -177,7 +177,7 @@ protected void drawWidget(int mouseX, int mouseY, float delta) {
 			this.capesTab = true;
 		});
 		navBar.add(capesTab);
-		var importButton = new VanillaButtonWidget(capesTab.getX()+capesTab.getWidth()-11, capesTab.getY()-13, 11, 11, I18n.translate("skins.manage.import"), btn -> {
+		var importButton = new VanillaButtonWidget(capesTab.getX() + capesTab.getWidth() - 11, capesTab.getY() - 13, 11, 11, I18n.translate("skins.manage.import"), btn -> {
 			btn.active = false;
 			SkinImportUtil.openImportSkinDialog().thenAccept(this::filesDragged).thenRun(() -> btn.active = true);
 		}) {

1.8.9/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinManager.java

@@ -58,6 +58,7 @@ public Skin read(Path p) {
 			sha256 = Hashing.sha256().hashBytes(in).toString();
 			try (var bs = new ByteArrayInputStream(in)) {
 				var img = ImageIO.read(bs);
+				if (img.getWidth() != 64 || img.getHeight() != 64) return null;
 				slim = (ClientColors.ARGB.alpha(img.getRGB(47, 63)) == 0);
 			}
 			return new Skin.Local(!slim, Hashing.sha512().hashUnencodedChars(p.toString()).toString(), p, sha256);

common/src/main/java/io/github/axolotlclient/modules/auth/skin/SkinImportUtil.java

@@ -36,10 +36,11 @@ public static CompletableFuture<List<Path>> openImportSkinDialog() {
 		return CompletableFuture.supplyAsync(() -> {
 			try (MemoryStack stack = MemoryStack.stackPush()) {
 				var pointers = stack.pointers(stack.UTF8("*.png"));
-				var result = TinyFileDialogs.tinyfd_openFileDialog("Import Skins", FabricLoader.getInstance().getGameDir().toString(), pointers, null, true);
+				@SuppressWarnings("DataFlowIssue") var result = TinyFileDialogs.tinyfd_openFileDialog("Import Skins",
+					FabricLoader.getInstance().getGameDir().toString(), pointers, null, true);
 				if (result != null) {
 					return Arrays.stream(result.split("\\|"))
-						.map(Path::of).peek(System.out::println).toList();
+						.map(Path::of).toList();
 				}
 				return List.of();
 			}