Fix #5891: property-based EnumMap parsing after skipped unknown enum keys (#5892)

Author: dlwldnjs1009

release-notes/CREDITS

@@ -215,7 +215,10 @@ Lee Jiwon (@dlwldnjs1009)
  * Fixed #5867: Fix `Map.Entry` deserialization for property-level
    `Shape.NATURAL` override
   [3.1.2]
- * Fixed  #5870: `EnumMap` and `EnumSet` properties ignore `@JsonDeserialize(contentConverter)`
+ * Fixed #5870: `EnumMap` and `EnumSet` properties ignore `@JsonDeserialize(contentConverter)`
+  [3.1.2]
+ * Fixed #5891: `EnumMapDeserializer._deserializeUsingProperties()` corrupts parser
+   state after skipping unknown enum keys
   [3.1.2]
 
 Garret Wilson (@garretwilson)

release-notes/VERSION

@@ -28,6 +28,9 @@ No changes since 3.1
   on another property
  (reported by Aleksandr G)
  (fix by @cowtowncoder, w/ Claude code)
+#5891: `EnumMapDeserializer._deserializeUsingProperties()` corrupts parser
+  state after skipping unknown enum keys
+ (fixed by Lee Jiwon)
 
 3.1.1 (27-Mar-2026)
 

src/main/java/tools/jackson/databind/deser/jdk/EnumMapDeserializer.java

@@ -373,7 +373,6 @@ public EnumMap<?,?> _deserializeUsingProperties(JsonParser p, DeserializationCon
                 }
                 // 24-Mar-2012, tatu: Null won't work as a key anyway, so let's
                 //  just skip the entry then. But we must skip the value as well, if so.
-                p.nextToken();
                 p.skipChildren();
                 continue;
             }

src/test/java/tools/jackson/databind/deser/enums/EnumMapDeserializationTest.java

@@ -190,6 +190,33 @@ public void testCustomEnumMapFromProps() throws Exception
         assertEquals(2, map.size());
     }
 
+    // [databind#5891]: extra p.nextToken() in _deserializeUsingProperties()
+    //   corrupts parser state when skipping unknown enum key
+    @Test
+    public void testUnknownKeyAsNullWithPropertyBasedCreator() throws Exception
+    {
+        ObjectReader r = MAPPER.readerFor(FromPropertiesEnumMap.class)
+                .with(EnumFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL);
+
+        _verifyFromPropertiesEnumMap(r.readValue(a2q(
+                "{'NOPE':'skip','a':13,'RULES':'jackson','b':-731,'OK':'yes'}")));
+
+        // Unknown-key values are skipped before deserializing into EnumMap<String>.
+        _verifyFromPropertiesEnumMap(r.readValue(a2q(
+                "{'NOPE':{'nested':'value'},'a':13,'RULES':'jackson','b':-731,'OK':'yes'}")));
+        _verifyFromPropertiesEnumMap(r.readValue(a2q(
+                "{'NOPE':[1,2,3],'a':13,'RULES':'jackson','b':-731,'OK':'yes'}")));
+    }
+
+    private void _verifyFromPropertiesEnumMap(FromPropertiesEnumMap map)
+    {
+        assertEquals(13, map.a0);
+        assertEquals(-731, map.b0);
+        assertEquals("jackson", map.get(TestEnum.RULES));
+        assertEquals("yes", map.get(TestEnum.OK));
+        assertEquals(2, map.size());
+    }
+
     /*
     /**********************************************************
     /* Test methods: polymorphic