#829 Throw KryoException instead of IndexOutOfBoundsException whe…

…n reference cannot be resolved
EsotericSoftware · May 23, 2021 · a830dac · a830dac
1 parent 2b0a2c5
commit a830dac
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/com/esotericsoftware/kryo/Kryo.java b/src/com/esotericsoftware/kryo/Kryo.java
@@ -919,7 +919,11 @@ int readReferenceOrNull (Input input, Class type, boolean mayBeNull) {
 		}
 		// The id is an object reference.
 		id -= 2; // - 2 because 0 and 1 are used for NULL and NOT_NULL.
-		readObject = referenceResolver.getReadObject(type, id);
+		try {
+			readObject = referenceResolver.getReadObject(type, id);
+		} catch (Exception e) {
+			throw new KryoException("Unable to resolve reference for " + className(type) + " with id: " + id, e);
+		}
 		if (DEBUG) debug("kryo", "Read reference " + id + ": " + string(readObject) + pos(input.position()));
 		return REF;
 	}

diff --git a/test/com/esotericsoftware/kryo/ReferenceTest.java b/test/com/esotericsoftware/kryo/ReferenceTest.java
@@ -104,6 +104,20 @@ void testReadingNestedObjectsFirst () {
 		roundTrip(23, subList);
 	}
 
+	@Test
+	void testReadInvalidReference() {
+		kryo.setReferences(true);
+		kryo.register(Ordering.class);
+		final Input input = new Input(new byte[]{3});
+		try {
+			kryo.readObject(input, Ordering.class);
+		} catch (KryoException ex) {
+			assertTrue(ex.getMessage().contains("Unable to resolve reference"));
+			return;
+		}
+		fail("Exception was expected");
+	}
+
 	public static class SubListSerializer extends Serializer<List> {
 		private Field listField, offsetField, sizeField;