Block one more gadget type (javax.swing, CVE-2020-10969)

Merged from FasterXML/jackson-databind#2642
atlassian · May 8, 2020 · 5010c29 · 5010c29
1 parent 574f312
commit 5010c29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -50,6 +50,7 @@ One more patch release for 1.9.
 * [databind#2620]: Block one more gadget type (xbean-reflect/JNDI - CVE-2020-8840)
 * [databind#2631]: Block one more gadget type (shaded-hikari-config, CVE-2020-9546)
 * [databind#2634]: Block two more gadget types (ibatis-sqlmap, anteros-core; CVE-2020-9547 / CVE-2020-9548)
+* [databind#2642]: Block one more gadget type (javax.swing, CVE-2020-10969)
 
 1.9.13 (14-Jul-2013)
 

diff --git a/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/SubTypeValidator.java b/src/mapper/java/org/codehaus/jackson/map/jsontype/impl/SubTypeValidator.java
@@ -115,6 +115,9 @@ public class SubTypeValidator
         s.add("com.ibatis.sqlmap.engine.transaction.jta.JtaTransactionConfig");
         s.add("br.com.anteros.dbcp.AnterosDBCPConfig");
 
+        // [databind#2642]: javax.swing (jdk)
+        s.add("javax.swing.JEditorPane");
+
         DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
     }