MKV attachments bug fixes. (Patch by Bernie Purcell)

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index f1025bbe0153bfcf0d96d34af9cb516d7cef54a2..9308b02d3451465bd9efd2be02decc4e9888c7a6 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -1647,10 +1647,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             *pi_int = p_sys->stored_attachments.size();
             *ppp_attach = (input_attachment_t**)malloc( sizeof(input_attachment_t**) *
                                                         p_sys->stored_attachments.size() );
+            if( !(*ppp_attach) )
+                return VLC_ENOMEM;
             for( i = 0; i < p_sys->stored_attachments.size(); i++ )
             {
                 attachment_c *a = p_sys->stored_attachments[i];
-                *(ppp_attach)[i] = vlc_input_attachment_New( a->psz_file_name.c_str(), a->psz_mime_type.c_str(), NULL,
+                (*ppp_attach)[i] = vlc_input_attachment_New( a->psz_file_name.c_str(), a->psz_mime_type.c_str(), NULL,
                                                              a->p_data, a->i_size );
             }
             return VLC_SUCCESS;
@@ -4987,6 +4989,10 @@ void matroska_segment_c::ParseAttachments( KaxAttachments *attachments )
                 memcpy( new_attachment->p_data, img_data.GetBuffer(), img_data.GetSize() );
                 sys.stored_attachments.push_back( new_attachment );
             }
+            else
+            {
+                delete new_attachment;
+            }
         }
 
         attachedFile = &GetNextChild<KaxAttached>( *attachments, *attachedFile );