diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 4fb1b00b..6bbbffa6 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,28 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 563ecfb55ca77c0fc5ea19e4885e00f55ec82ca9
+<pre class='wrap'>commit 9c1cfb034a8cf24eb5e35fe9c7074fd079d14b80
+Merge: 563ecfb 1c54024
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-04-01 22:00:19 +0200
+
+    Merge pull request #1240 from rouault/fix_crash_opj_decompress
+    
+    opj_decompress: add sanity checks to avoid segfault in case of decoding error
+
+commit 1c54024165fd5db0e6047f28903274eb27d0980f
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-04-01 20:58:55 +0200
+
+    opj_decompress: add sanity checks to avoid segfault in case of decoding error
+    
+    Prevent crashes like:
+    opj_decompress -i 0722_5-1_2019.jp2 -o out.ppm -r 4 -t 0
+    
+    where 0722_5-1_2019.jp2 is
+    https://drive.google.com/file/d/1ZxOUZg2-FKjYwa257VFLMpTXRWxEoP0a/view?usp=sharing
+
+commit 563ecfb55ca77c0fc5ea19e4885e00f55ec82ca9
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2020-02-13 09:59:17 +0100
 
@@ -877,21 +898,6 @@ Date:   2018-03-04 23:54:09 +0100
     
     Fix Mac builds
 
-commit 8ad94f689ecabc5e9058874af42306793d5b93e9
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2018-03-04 23:27:44 +0100
-
-    Fix Mac builds
-
-commit 3910be8a68d21df5f23e764c593058ba35557051
-Merge: e98d0a2 cfc5395
-Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
-Date:   2018-03-04 23:19:59 +0100
-
-    Merge pull request #1062 from radarhere/master
-    
-    Fixed typos
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index 3cb66cbb..27029134 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' => '2020-02-13 09:59:17'
+                      'current' => '2020-04-01 22:00:19'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -813,7 +813,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1581585256',
+          'ScmUpdateTime' => '1585771803',
           '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 c1ccf371..69167aee 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 4713b2ae..a9c34ca8 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 03325eaa..bbd60e50 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 7949dac6..7488b1ca 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 961cbe14..d4a55036 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>2020-02-13<br/>09:59</td>
+<td>2020-04-01<br/>22:00</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 Thu Feb 13 09:14:52 2020.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Wed Apr  1 20:10:39 2020.<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>