[vlc-commits] mkv: Fix potential double free

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon May 20 11:43:26 2019 +0200| [8b7db5e19d2eeb092efac0ef252cf17a79ec82ad] | committer: Hugo Beauzée-Luyssen

mkv: Fix potential double free

(cherry picked from commit 81023659c7de5ac2637b4a879195efef50846102)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=8b7db5e19d2eeb092efac0ef252cf17a79ec82ad
---

 modules/demux/mkv/util.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/demux/mkv/util.cpp b/modules/demux/mkv/util.cpp
index 275c6fad34..68f715a821 100644
--- a/modules/demux/mkv/util.cpp
+++ b/modules/demux/mkv/util.cpp
@@ -87,6 +87,7 @@ int32_t zlib_decompress_extra( demux_t * p_demux, mkv_track_t & tk )
         msg_Err( p_demux, "Couldn't allocate buffer to inflate data, ignore track %u",
                  tk.i_number );
         inflateEnd( &d_stream );
+        tk.p_extra_data = NULL;
         return 1;
     }