[libav-devel] [PATCH 2/3] avformat/matroskadec: Call matroska_read_close() on header parsing error

Sean McGovern gseanmcg at gmail.com
Sat Nov 4 20:00:02 CET 2017


Hi again,

On Thu, Nov 2, 2017 at 4:07 PM, Sean McGovern <gseanmcg at gmail.com> wrote:
> Hi Vittorio,
>
>
>
> On Nov 2, 2017 11:19 AM, "Vittorio Giovara" <vittorio.giovara at gmail.com>
> wrote:
>
> On Wed, Nov 1, 2017 at 10:10 PM, Sean McGovern <gseanmcg at gmail.com> wrote:
>
>> From: Michael Niedermayer <michael at niedermayer.cc>
>>
>> Fixes memleak
>>
>
> nit full stop
>
> Fixes Ticket5169
>>
>
> Please use the syntax "Bug-Id: ffmpeg/Ticket5169".
>
>
>> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
>> ---
>>  libavformat/matroskadec.c | 9 +++++++--
>>  1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
>> index 3743d4d..9c523fb 100644
>> --- a/libavformat/matroskadec.c
>> +++ b/libavformat/matroskadec.c
>> @@ -592,6 +592,8 @@ static EbmlSyntax matroska_clusters_incremental[] = {
>>
>>  static const char *const matroska_doctypes[] = { "matroska", "webm" };
>>
>> +static int matroska_read_close(AVFormatContext *s);
>> +
>>
>
> if possible there should be a separate patch that moves matroska_read_close
> here, rather than introducing a forward statement.

<...snipped for brevity..>

Unfortunately this can't move -- it will turn into a very large
re-organization of this file.

matroska_read_close() calls other matroska_* and ebml_* functions that
are defined further down.

-- Sean McG.


More information about the libav-devel mailing list