RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 20:37:04 +00:00
Code Issues Projects Releases Wiki Activity

oggdec: make sure the private parse data is cleaned up

Browse Source 
(cherry picked from commit d894f74762)

Related to CVE-2012-2882

Conflicts:

	libavformat/oggdec.h
	libavformat/oggparsevorbis.c
This commit is contained in:
Luca Barbato 2013-01-04 16:05:51 +01:00 committed by Reinhard Tartler
parent 6a9f050c22
commit 8829c79039
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/oggdec.c
View File

@ -508,6 +508,10 @@ static int ogg_read_close(AVFormatContext *s)
for (i = 0; i < ogg->nstreams; i++) { for (i = 0; i < ogg->nstreams; i++) {
av_free(ogg->streams[i].buf); av_free(ogg->streams[i].buf);
if (ogg->streams[i].codec &&
ogg->streams[i].codec->cleanup) {
ogg->streams[i].codec->cleanup(s, i);
}
av_free(ogg->streams[i].private); av_free(ogg->streams[i].private);
} }
av_free(ogg->streams); av_free(ogg->streams);

5
libavformat/oggdec.h
View File

@ -51,6 +51,11 @@ struct ogg_codec {
* 0 if granule is the end time of the associated packet. * 0 if granule is the end time of the associated packet.
*/ */
int granule_is_start; int granule_is_start;
/**
* Number of expected headers
*/
int nb_header;
void (*cleanup)(AVFormatContext *s, int idx);
}; };
struct ogg_stream { struct ogg_stream {

14
libavformat/oggparsevorbis.c
View File

@ -188,6 +188,16 @@ fixup_vorbis_headers(AVFormatContext * as, struct oggvorbis_private *priv,
return offset; return offset;
} }
static int vorbis_cleanup(AVFormatContext *s, int idx)
{
struct ogg *ogg = s->priv_data;
struct ogg_stream *os = ogg->streams + idx;
struct oggvorbis_private *priv = os->private;
int i;
if (os->private)
for (i = 0; i < 3; i++)
av_freep(&priv->packet[i]);
}
static int static int
vorbis_header (AVFormatContext * s, int idx) vorbis_header (AVFormatContext * s, int idx)
@ -278,5 +288,7 @@ vorbis_header (AVFormatContext * s, int idx)
const struct ogg_codec ff_vorbis_codec = { const struct ogg_codec ff_vorbis_codec = {
.magic = "\001vorbis", .magic = "\001vorbis",
.magicsize = 7, .magicsize = 7,
.header = vorbis_header .header = vorbis_header,
.cleanup= vorbis_cleanup,
.nb_header = 3,
}; };