diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2009-10-16 11:24:04 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2009-10-16 11:24:04 +0000 |
| commit | 67c2ef94bcbed47eff78772f5e631e63bc5541cb (patch) | |
| tree | 33d323f4a9376740b04ac1f78408bc8aafb3b601 /multimedia | |
| parent | 4bce338cef855611749023d5c8edfd3f4c41a6e5 (diff) | |
| download | ports-67c2ef94bcbed47eff78772f5e631e63bc5541cb.tar.gz ports-67c2ef94bcbed47eff78772f5e631e63bc5541cb.zip | |
Notes
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavformat-sierravmd.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 8e6749ed0a46..588f27e8a141 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,6 +7,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c b/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c new file mode 100644 index 000000000000..5c5e61694f70 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c @@ -0,0 +1,12 @@ +--- libavformat/sierravmd.c ++++ libavformat/sierravmd.c +@@ -154,7 +154,7 @@ static int vmd_read_header(AVFormatContext *s, + vmd->frame_table = NULL; + sound_buffers = AV_RL16(&vmd->vmd_header[808]); + raw_frame_table_size = vmd->frame_count * 6; +- if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame)){ ++ if(vmd->frame_count * vmd->frames_per_block >= (UINT_MAX - sound_buffers) / sizeof(vmd_frame)){ + av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); + return -1; + } + |