generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oggdec: check memory allocation

Browse Source
This commit is contained in:
Luca Barbato 2012-12-22 17:58:24 +01:00
parent f5f1cf5224
commit ba064ebe48
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/oggdec.c
View File

@ -160,8 +160,13 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t serial, int new_avstream)
AVStream *st; AVStream *st;
struct ogg_stream *os; struct ogg_stream *os;
ogg->streams = av_realloc(ogg->streams, os = av_realloc(ogg->streams, ogg->nstreams * sizeof(*ogg->streams));
ogg->nstreams * sizeof(*ogg->streams));
if (!os)
return AVERROR(ENOMEM);
ogg->streams = os;
memset(ogg->streams + idx, 0, sizeof(*ogg->streams)); memset(ogg->streams + idx, 0, sizeof(*ogg->streams));
os = ogg->streams + idx; os = ogg->streams + idx;
@ -305,6 +310,8 @@ static int ogg_read_page(AVFormatContext *s, int *str)
if (os->bufsize - os->bufpos < size) { if (os->bufsize - os->bufpos < size) {
uint8_t *nb = av_malloc((os->bufsize *= 2) + FF_INPUT_BUFFER_PADDING_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); memcpy(nb, os->buf, os->bufpos);
av_free(os->buf); av_free(os->buf);
os->buf = nb; os->buf = nb;