Merge pull request #106 from internetstaff/utf8

isParseable should reject chars > 256 instead of throwing ArrayIndexOutOfBoundsException
f4b6a3 · Mar 1, 2025 · d71bde2 · d71bde2
2 parents dac7204 + 93c6219
commit d71bde2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/com/github/f4b6a3/uuid/util/UuidValidator.java b/src/main/java/com/github/f4b6a3/uuid/util/UuidValidator.java
@@ -251,7 +251,7 @@ public static void validate(final char[] uuid, int version) {
 	protected static boolean isParseable(final char[] chars) {
 		int dashCount = 0;
 		for (int i = 0; i < chars.length; i++) {
-			if (MAP.get(chars[i]) == -1) {
+			if (chars[i] > MAP.length() || MAP.get(chars[i]) == -1) {
 				if (chars[i] == '-') {
 					dashCount++;
 					continue;

diff --git a/src/test/java/com/github/f4b6a3/uuid/util/UuidValidatorTest.java b/src/test/java/com/github/f4b6a3/uuid/util/UuidValidatorTest.java
@@ -93,6 +93,10 @@ public void testIsValidString() {
 		uuid = "01234567-89ab-4def-!@#$-ef0123456789"; // String with non alphanumeric chars
 		assertFalse("UUID string non alphanumeric chars should be invalid.", UuidValidator.isValid(uuid));
 
+
+		uuid = "01234567-89ab-4def-😊🤖-ef0123456789"; // String with UTF8 chars
+		assertFalse("UUID string UTF8 chars should be invalid.", UuidValidator.isValid(uuid));
+
 		try {
 			uuid = null;
 			UuidValidator.validate(uuid);