diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 02266afb..cd82bd7f 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,26 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 172c8ae5cf230ff74b5814daf29e5b577aa30a9b
+<pre class='wrap'>commit cbee7891a0ee664dd83ca09553d2e30da716a883
+Merge: 172c8ae e8e258a
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-06-30 22:05:13 +0200
+
+    Merge pull request #1262 from rouault/fix_1261
+    
+    opj_decompress: fix double-free on input directory with mix of valid and invalid images
+
+commit e8e258ab049240c2dd1f1051b4e773b21e2d3dc0
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-06-28 14:19:59 +0200
+
+    opj_decompress: fix double-free on input directory with mix of valid and invalid images (CVE-2020-15389)
+    
+    Fixes #1261
+    
+    Credits to @Ruia-ruia for reporting and analysis.
+
+commit 172c8ae5cf230ff74b5814daf29e5b577aa30a9b
 Merge: e252438 b028e8d
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2020-06-22 22:35:44 +0200
@@ -930,24 +949,6 @@ Date:   2018-09-22 22:54:51 +0200
     
     Relative path to header files is hardcoded in OpenJPEGConfig.cmake.in file
 
-commit c6ee006250b093f443e226288c6c866c5ebe12f5
-Merge: 2d28610 98363e2
-Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
-Date:   2018-09-22 22:47:27 +0200
-
-    Merge pull request #1141 from szukw000/changes-in-pnmtoimage
-    
-    Changes in pnmtoimage if image data are missing
-
-commit 2d2861036cfb68560e0cf21340760781ea78595d
-Merge: 1b9a81d 31a03b3
-Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
-Date:   2018-09-22 22:28:04 +0200
-
-    Merge pull request #1143 from stweil/format
-    
-    openjp2/jp2: Fix two format strings
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index d1bedc47..21b3d234 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-06-22 22:35:44'
+                      'current' => '2020-06-30 22:05:13'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -813,7 +813,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1592858770',
+          'ScmUpdateTime' => '1593548119',
           '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 17f4a180..ad1a81f5 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 d0df0620..ecbd6c56 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 00fb8630..8f99a8c4 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 8cd2812b..5e97f711 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 1ee8f993..060b08f8 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-06-22<br/>22:35</td>
+<td>2020-06-30<br/>22:05</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 Mon Jun 22 20:46:48 2020.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Tue Jun 30 20:15:59 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>