Skip to content

Commit 4c93566

Browse files
committed
Merge branch '2.7' into 2.8
2 parents 232e518 + c9ef4a1 commit 4c93566

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

release-notes/VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Project: jackson-databind
66
2.8.11.4 (not released)
77

88
#2326: Block one more gadget type (CVE-2019-12086)
9+
#2334: Block class for CVE-2019-12384
910

1011
2.8.11.3 (23-Nov-2018)
1112

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/SubTypeValidator.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,12 @@ public class SubTypeValidator
8282
s.add("org.apache.openjpa.ee.JNDIManagedRuntime");
8383
s.add("org.apache.axis2.transport.jms.JMSOutTransportInfo");
8484

85-
// [databind#2326] (2.8.11.4: one more 3rd party gadget
85+
// [databind#2326]
8686
s.add("com.mysql.cj.jdbc.admin.MiniAdmin");
8787

88+
// [databind#2334]
89+
s.add("ch.qos.logback.core.db.DriverManagerConnectionSource");
90+
8891
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);
8992
}
9093

0 commit comments

Comments
 (0)