Skip to content

Commit 232e518

Browse files
committed
Merge branch '2.7' into 2.8
2 parents efc3c0d + b596365 commit 232e518

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

release-notes/VERSION

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ Project: jackson-databind
99

1010
2.8.11.3 (23-Nov-2018)
1111

12-
#2097: Block more classes from polymorphic deserialization (CVE-2018-14718
13-
- CVE-2018-14721)
14-
(reported by Guixiong Wu)
15-
#2109: Canonical string for reference type is built incorrectly
16-
(reported by svarzee@github)
17-
#2186: Block more classes from polymorphic deserialization (CVE-2018-19360,
18-
CVE-2018-19361, CVE-2018-19362)
19-
(reported by Guixiong Wu)
12+
#2326: Block class for CVE-2019-12086
13+
(contributed by MaximilianTews@github)
2014

2115
2.8.11.2 (08-Jun-2018)
2216

@@ -252,6 +246,17 @@ Project: jackson-databind
252246
#1277: Add caching of resolved generic types for `TypeFactory`
253247
(requested by Andriy P)
254248

249+
2.7.9.5 (23-Nov-2018)
250+
251+
#2097: Block more classes from polymorphic deserialization (CVE-2018-14718
252+
- CVE-2018-14721)
253+
(reported by Guixiong Wu)
254+
#2109: Canonical string for reference type is built incorrectly
255+
(reported by svarzee@github)
256+
#2186: Block more classes from polymorphic deserialization (CVE-2018-19360,
257+
CVE-2018-19361, CVE-2018-19362)
258+
(reported by Guixiong Wu)
259+
255260
2.7.9 (04-Feb-2017)
256261

257262
#1367: No Object Id found for an instance when using `@ConstructorProperties`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ 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.9.9): one more 3rd party gadget
85+
// [databind#2326] (2.8.11.4: one more 3rd party gadget
8686
s.add("com.mysql.cj.jdbc.admin.MiniAdmin");
8787

8888
DEFAULT_NO_DESER_CLASS_NAMES = Collections.unmodifiableSet(s);

0 commit comments

Comments
 (0)