Browse Source

oggdec: check memory allocation

tags/n1.1
Luca Barbato 13 years ago
parent
commit
ba064ebe48
1 changed files with 9 additions and 2 deletions
  1. +9
    -2
      libavformat/oggdec.c

+ 9
- 2
libavformat/oggdec.c View File

@@ -160,8 +160,13 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t serial, int new_avstream)
AVStream *st;
struct ogg_stream *os;

ogg->streams = av_realloc(ogg->streams,
ogg->nstreams * sizeof(*ogg->streams));
os = av_realloc(ogg->streams, ogg->nstreams * sizeof(*ogg->streams));

if (!os)
return AVERROR(ENOMEM);

ogg->streams = os;

memset(ogg->streams + idx, 0, sizeof(*ogg->streams));

os = ogg->streams + idx;
@@ -305,6 +310,8 @@ static int ogg_read_page(AVFormatContext *s, int *str)

if (os->bufsize - os->bufpos < size) {
uint8_t *nb = av_malloc((os->bufsize *= 2) + FF_INPUT_BUFFER_PADDING_SIZE);
if (!nb)
return AVERROR(ENOMEM);
memcpy(nb, os->buf, os->bufpos);
av_free(os->buf);
os->buf = nb;


Loading…
Cancel
Save