diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 7c5051f7..df3b47bc 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,16 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 9701b3305db58d35e4446946309f88937e2f5342
+<pre class='wrap'>commit ac3737372a00b8778b528094dd5bd58a74f67d42
+Merge: 9701b33 4cb1f66
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2019-11-17 13:08:41 +0100
+
+    Merge pull request #1217 from rouault/fix_ossfuzz_18979
+    
+    pi.c: avoid integer overflow, resulting in later invalid access to memory in opj_t2_decode_packets()
+
+commit 9701b3305db58d35e4446946309f88937e2f5342
 Author: Robert Ancell &lt;robert.ancell@gmail.com&gt;
 Date:   2019-11-17 15:09:59 +1300
 
@@ -48,6 +57,12 @@ Date:   2019-11-17 01:35:26 +0100
     and recreating them. It is likely that some tooling has evolved since
     the initial v2.3.1 report generation.
 
+commit 4cb1f663049aab96e122d1ff16f601d0cc0be976
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2019-11-17 01:18:26 +0100
+
+    pi.c: avoid integer overflow, resulting in later invalid access to memory in opj_t2_decode_packets(). Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=18979
+
 commit 5875a6b44618fb7dfd5cd6d742533eaee2014060
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2019-10-03 11:04:30 +0200
@@ -879,20 +894,6 @@ Date:   2018-02-25 18:21:23 +0100
     
     fix unchecked integer multiplication overflow
 
-commit 06f7d412435ddb62f8e9935af7e306783bc4b75b
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2018-02-18 14:38:16 +0100
-
-    bench_dwt: fix wrong index in iteration (issue found by Fethi Migaou)
-
-commit 24d08ff94ad8b0f51534e46f87cf5a2f2f85d22a
-Author: setharnold &lt;seth.arnold@gmail.com&gt;
-Date:   2018-02-14 17:46:38 -0800
-
-    fix unchecked integer multiplication overflow
-    
-    Hello, this fixes an unchecked integer multiplication overflow. Thanks.
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index aaadf704..cc29e91d 100644
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -705,7 +705,7 @@ $VAR1 = {
                       '2.2.0' => '2017-08-10 00:31',
                       '2.3.0' => '2017-10-04 22:23',
                       '2.3.1' => '2019-04-02 10:08',
-                      'current' => '2019-11-17 15:09:59'
+                      'current' => '2019-11-17 13:08:41'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -813,7 +813,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1573957233',
+          'ScmUpdateTime' => '1573993152',
           'Soname' => {
                         '1.1' => {
                                    'lib/libopenjpeg.so' => 'libopenjpeg.so'
diff --git a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a
index 0b2d6715..eb7f3636 100644
Binary files a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a and b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.a differ
diff --git a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1
index db2d155e..3921a8d6 100644
Binary files a/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 and b/abi-check/installed/openjpeg/2.3.1/lib/libopenjp2.so.2.3.1 differ
diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.a b/abi-check/installed/openjpeg/current/lib/libopenjp2.a
index ac9ede89..41a0a7d2 100644
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.a and b/abi-check/installed/openjpeg/current/lib/libopenjp2.a differ
diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1
index 31830183..24a860d3 100644
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.1 differ
diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index c5992ac6..576b5ddf 100644
--- a/abi-check/timeline/openjpeg/index.html
+++ b/abi-check/timeline/openjpeg/index.html
@@ -30,7 +30,7 @@
 <th>Headers<br/>Diff</th>
 </tr>
 <tr id='current'><td>current</td>
-<td>2019-11-17<br/>15:09</td>
+<td>2019-11-17<br/>13:08</td>
 <td>7</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td class='ok'><a href='../../objects_report/openjpeg/2.3.1/current/report.html'>100%</a></td>
@@ -179,7 +179,7 @@
 <td>N/A</td>
 <td>N/A</td>
 </tr>
-</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sun Nov 17 02:21:19 2019.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sun Nov 17 12:19:58 2019.<br/>
 <br/>
 <hr/>
 <div align='right'><a class='home' title="Andrey Ponomarenko's ABI laboratory" href='http://abi-laboratory.pro/'>abi-laboratory.pro</a></div>