diff --git a/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump b/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump
index cac39d71..4f93e694 100644
--- a/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump
+++ b/abi-check/abi_dump/openjpeg/current/ef225/ABI.dump
@@ -207,7 +207,7 @@ $VAR1 = {
                                          'Source' => 'cio.c',
                                          'SourceLine' => '271'
                                        },
-                            '173930' => {
+                            '173947' => {
                                           'Header' => 'openjpeg.h',
                                           'Line' => '1096',
                                           'Return' => '156',
@@ -215,13 +215,13 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '160'
                                         },
-                            '174250' => {
+                            '174267' => {
                                           'Header' => 'openjpeg.h',
                                           'Line' => '1648',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'cstr_info',
-                                                                'type' => '174268'
+                                                                'type' => '174285'
                                                               }
                                                      },
                                           'Reg' => {
@@ -232,12 +232,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '997'
                                         },
-                            '236848' => {
+                            '236865' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_callback',
@@ -258,12 +258,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '44'
                                         },
-                            '236946' => {
+                            '236963' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_callback',
@@ -284,12 +284,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '59'
                                         },
-                            '237032' => {
+                            '237049' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_callback',
@@ -310,23 +310,23 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '74'
                                         },
-                            '237147' => {
+                            '237164' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_format',
-                                                                'type' => '225854'
+                                                                'type' => '225871'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi'
                                                    },
-                                          'Return' => '236934',
+                                          'Return' => '236951',
                                           'ShortName' => 'opj_create_decompress',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '168'
                                         },
-                            '237369' => {
+                            '237386' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
@@ -342,12 +342,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '364'
                                         },
-                            '237500' => {
+                            '237517' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'num_threads',
@@ -363,12 +363,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '387'
                                         },
-                            '237618' => {
+                            '237635' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'parameters',
@@ -384,7 +384,7 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '398'
                                         },
-                            '237760' => {
+                            '237777' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
@@ -393,7 +393,7 @@ $VAR1 = {
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '2' => {
                                                                 'name' => 'p_image',
@@ -410,12 +410,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '418'
                                         },
-                            '237963' => {
+                            '237980' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'numcomps',
@@ -441,12 +441,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '442'
                                         },
-                            '238205' => {
+                            '238222' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
@@ -467,12 +467,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '471'
                                         },
-                            '238359' => {
+                            '238376' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_image',
@@ -508,12 +508,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '492'
                                         },
-                            '238567' => {
+                            '238584' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
@@ -569,12 +569,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '515'
                                         },
-                            '238773' => {
+                            '238790' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_tile_index',
@@ -605,12 +605,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '546'
                                         },
-                            '238973' => {
+                            '238990' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
@@ -636,12 +636,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '572'
                                         },
-                            '239150' => {
+                            '239167' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'res_factor',
@@ -657,23 +657,23 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '596'
                                         },
-                            '239259' => {
+                            '239276' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_format',
-                                                                'type' => '225854'
+                                                                'type' => '225871'
                                                               }
                                                      },
                                           'Reg' => {
                                                      '0' => 'rdi'
                                                    },
-                                          'Return' => '236934',
+                                          'Return' => '236951',
                                           'ShortName' => 'opj_create_compress',
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '614'
                                         },
-                            '239484' => {
+                            '239501' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
@@ -689,12 +689,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '722'
                                         },
-                            '239615' => {
+                            '239632' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'parameters',
@@ -715,12 +715,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '783'
                                         },
-                            '239753' => {
+                            '239770' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'options',
@@ -736,12 +736,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '803'
                                         },
-                            '239868' => {
+                            '239885' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_image',
@@ -762,12 +762,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '822'
                                         },
-                            '240022' => {
+                            '240039' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_info',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
@@ -783,12 +783,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '841'
                                         },
-                            '240153' => {
+                            '240170' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
@@ -804,12 +804,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '858'
                                         },
-                            '240284' => {
+                            '240301' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_stream',
@@ -825,7 +825,7 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '875'
                                         },
-                            '240415' => {
+                            '240432' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
@@ -856,12 +856,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '895'
                                         },
-                            '240761' => {
+                            '240778' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'p_tile_index',
@@ -892,12 +892,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '925'
                                         },
-                            '240961' => {
+                            '240978' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               }
                                                      },
                                           'Reg' => {
@@ -908,12 +908,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '952'
                                         },
-                            '241062' => {
+                            '241079' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               },
                                                        '1' => {
                                                                 'name' => 'info_flag',
@@ -934,12 +934,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '970'
                                         },
-                            '241199' => {
+                            '241216' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               }
                                                      },
                                           'Reg' => {
@@ -950,12 +950,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '986'
                                         },
-                            '241363' => {
+                            '241380' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_codec',
-                                                                'type' => '236934'
+                                                                'type' => '236951'
                                                               }
                                                      },
                                           'Reg' => {
@@ -966,12 +966,12 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '1014'
                                         },
-                            '241448' => {
+                            '241465' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
                                                                 'name' => 'p_cstr_index',
-                                                                'type' => '241508'
+                                                                'type' => '241525'
                                                               }
                                                      },
                                           'Reg' => {
@@ -982,7 +982,7 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '1025'
                                         },
-                            '241514' => {
+                            '241531' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
@@ -1008,7 +1008,7 @@ $VAR1 = {
                                           'Source' => 'openjpeg.c',
                                           'SourceLine' => '1040'
                                         },
-                            '241633' => {
+                            '241650' => {
                                           'Header' => 'openjpeg.h',
                                           'Param' => {
                                                        '0' => {
@@ -1440,7 +1440,7 @@ $VAR1 = {
                                      'Size' => '1',
                                      'Type' => 'Const'
                                    },
-                          '174268' => {
+                          '174285' => {
                                         'BaseType' => '76994',
                                         'Name' => 'opj_codestream_info_v2_t**',
                                         'Size' => '8',
@@ -2098,7 +2098,7 @@ $VAR1 = {
                                       'Size' => '216',
                                       'Type' => 'Struct'
                                     },
-                          '225804' => {
+                          '225821' => {
                                         'Header' => 'openjpeg.h',
                                         'Line' => '322',
                                         'Memb' => {
@@ -2131,15 +2131,15 @@ $VAR1 = {
                                         'Size' => '4',
                                         'Type' => 'Enum'
                                       },
-                          '225854' => {
-                                        'BaseType' => '225804',
+                          '225871' => {
+                                        'BaseType' => '225821',
                                         'Header' => 'openjpeg.h',
                                         'Line' => '329',
                                         'Name' => 'OPJ_CODEC_FORMAT',
                                         'Size' => '4',
                                         'Type' => 'Typedef'
                                       },
-                          '227611' => {
+                          '227628' => {
                                         'BaseType' => '130',
                                         'Header' => 'openjpeg.h',
                                         'Line' => '612',
@@ -2159,13 +2159,13 @@ $VAR1 = {
                                        'Size' => '4',
                                        'Type' => 'Const'
                                      },
-                          '236934' => {
-                                        'BaseType' => '227611',
+                          '236951' => {
+                                        'BaseType' => '227628',
                                         'Name' => 'opj_codec_t*',
                                         'Size' => '8',
                                         'Type' => 'Pointer'
                                       },
-                          '241508' => {
+                          '241525' => {
                                         'BaseType' => '74696',
                                         'Name' => 'opj_codestream_index_t**',
                                         'Size' => '8',
diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 84dda186..02266afb 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 e252438d5e23e6ba9561e73a5a4754713bfd626a
+<pre class='wrap'>commit 172c8ae5cf230ff74b5814daf29e5b577aa30a9b
+Merge: e252438 b028e8d
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2020-06-22 22:35:44 +0200
+
+    Merge pull request #1260 from sebras/fix-issue-1259
+    
+    openjp2: Plug image leak when failing to allocate codestream index.
+
+commit e252438d5e23e6ba9561e73a5a4754713bfd626a
 Merge: 98150d0 79b199a
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2020-06-22 22:12:08 +0200
@@ -29,6 +38,14 @@ Date:   2020-06-22 22:12:08 +0200
     
     openjp2: Plug memory leak when setting data as TLS fails.
 
+commit b028e8d1ce7798f61c35b1b20d836f80d78a35d0
+Author: Sebastian Rasmussen &lt;sebras@gmail.com&gt;
+Date:   2020-06-23 02:18:19 +0800
+
+    openjp2: Plug image leak when failing to allocate codestream index.
+    
+    This fixes issue #1259.
+
 commit 79b199a8fee2a0d51d4389fcde3f5f4dd01971eb
 Author: Sebastian Rasmussen &lt;sebras@gmail.com&gt;
 Date:   2020-06-23 02:18:19 +0800
@@ -931,21 +948,6 @@ Date:   2018-09-22 22:28:04 +0200
     
     openjp2/jp2: Fix two format strings
 
-commit 1b9a81dff7c22ed0cb22bf1033e6dfee1292da31
-Merge: 9d1a9dc c28ed52
-Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
-Date:   2018-09-22 22:27:14 +0200
-
-    Merge pull request #1149 from rouault/fix_knownfailures
-    
-    Update knownfailures- files given current configurations
-
-commit c28ed521633c074f1e4891208028fe97f7602a14
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2018-09-22 21:56:50 +0200
-
-    Update knownfailures- files given current configurations
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index bb90cb54..d1bedc47 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:12:08'
+                      'current' => '2020-06-22 22:35:44'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -813,7 +813,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1592857297',
+          'ScmUpdateTime' => '1592858770',
           '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 cacefb46..17f4a180 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 bc007d92..d0df0620 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 2b4eb50f..00fb8630 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 75b3c0d7..8cd2812b 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 44f88dff..1ee8f993 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:12</td>
+<td>2020-06-22<br/>22:35</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:22:14 2020.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Mon Jun 22 20:46:48 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>