Browse Source

nutdec: fix memleaks on error in nut_read_header

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 361702660d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.10
Andreas Cadhalpun Michael Niedermayer 10 years ago
parent
commit
91aa6d8a8b
1 changed files with 13 additions and 5 deletions
  1. +13
    -5
      libavformat/nutdec.c

+ 13
- 5
libavformat/nutdec.c View File

@@ -744,12 +744,14 @@ fail:
return ret; return ret;
} }


static int nut_read_close(AVFormatContext *s);

static int nut_read_header(AVFormatContext *s) static int nut_read_header(AVFormatContext *s)
{ {
NUTContext *nut = s->priv_data; NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
int64_t pos; int64_t pos;
int initialized_stream_count;
int initialized_stream_count, ret = 0;


nut->avf = s; nut->avf = s;


@@ -759,7 +761,8 @@ static int nut_read_header(AVFormatContext *s)
pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1; pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1;
if (pos < 0 + 1) { if (pos < 0 + 1) {
av_log(s, AV_LOG_ERROR, "No main startcode found.\n"); av_log(s, AV_LOG_ERROR, "No main startcode found.\n");
return AVERROR_INVALIDDATA;
ret = AVERROR_INVALIDDATA;
goto end;
} }
} while (decode_main_header(nut) < 0); } while (decode_main_header(nut) < 0);


@@ -769,7 +772,8 @@ static int nut_read_header(AVFormatContext *s)
pos = find_startcode(bc, STREAM_STARTCODE, pos) + 1; pos = find_startcode(bc, STREAM_STARTCODE, pos) + 1;
if (pos < 0 + 1) { if (pos < 0 + 1) {
av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n"); av_log(s, AV_LOG_ERROR, "Not all stream headers found.\n");
return AVERROR_INVALIDDATA;
ret = AVERROR_INVALIDDATA;
goto end;
} }
if (decode_stream_header(nut) >= 0) if (decode_stream_header(nut) >= 0)
initialized_stream_count++; initialized_stream_count++;
@@ -783,7 +787,8 @@ static int nut_read_header(AVFormatContext *s)


if (startcode == 0) { if (startcode == 0) {
av_log(s, AV_LOG_ERROR, "EOF before video frames\n"); av_log(s, AV_LOG_ERROR, "EOF before video frames\n");
return AVERROR_INVALIDDATA;
ret = AVERROR_INVALIDDATA;
goto end;
} else if (startcode == SYNCPOINT_STARTCODE) { } else if (startcode == SYNCPOINT_STARTCODE) {
nut->next_startcode = startcode; nut->next_startcode = startcode;
break; break;
@@ -805,7 +810,10 @@ static int nut_read_header(AVFormatContext *s)


ff_metadata_conv_ctx(s, NULL, ff_nut_metadata_conv); ff_metadata_conv_ctx(s, NULL, ff_nut_metadata_conv);


return 0;
end:
if (ret < 0)
nut_read_close(s);
return FFMIN(ret, 0);
} }


static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int is_meta, int64_t maxpos) static int read_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int is_meta, int64_t maxpos)


Loading…
Cancel
Save