diff options
| author | tron <tron> | 2009-09-25 11:10:21 +0000 |
|---|---|---|
| committer | tron <tron> | 2009-09-25 11:10:21 +0000 |
| commit | 7d016770b9126cc6400f2e1305f28d4609b113fc (patch) | |
| tree | 220fc88fc861458f047d16de6dd6e1d7c2c8cfc9 /multimedia | |
| parent | d735eef3c7b9ebf2aef3ebffc8bc0d0f4eec6b4e (diff) | |
| download | pkgsrc-7d016770b9126cc6400f2e1305f28d4609b113fc.tar.gz | |
Add patch from ffmpeg GIT repository to fix the vulnerability
reported in SA36760.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/patches/patch-ab | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 7092dc2f8a5..f84f341f14e 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.53 2009/09/20 08:13:21 ahoka Exp $ +# $NetBSD: Makefile,v 1.54 2009/09/25 11:10:21 tron Exp $ -PKGREVISION= 3 +PKGREVISION= 4 MAINTAINER= ahoka@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index a90141ac3fc..4ca830d435e 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.30 2009/09/22 16:46:50 ahoka Exp $ +$NetBSD: distinfo,v 1.31 2009/09/25 11:10:21 tron Exp $ SHA1 (ffmpeg-20090611.tar.bz2) = 04e67497f70c64b7a26534d4b67e3a46cdb4b219 RMD160 (ffmpeg-20090611.tar.bz2) = 447a72cd1a416f926100c61299d9012535909d9a Size (ffmpeg-20090611.tar.bz2) = 2799194 bytes SHA1 (patch-aa) = e40f61850fe5c85bdd4b659802601dfacfe73ad1 +SHA1 (patch-ab) = 1c1da33f47be51f75635a9667b0d7d8052945ba7 SHA1 (patch-bktr) = fb57a4f5dc0d372eb3f40dac5b05ea7d1da45d7b SHA1 (patch-configure) = ec0ae3c27026b45d380ecea04ff22518bf652ec0 SHA1 (patch-powerpc) = 0eaf8d81164e1488fdb436d50909d0a633439e6a diff --git a/multimedia/ffmpeg/patches/patch-ab b/multimedia/ffmpeg/patches/patch-ab new file mode 100644 index 00000000000..734037bac9f --- /dev/null +++ b/multimedia/ffmpeg/patches/patch-ab @@ -0,0 +1,18 @@ +$NetBSD: patch-ab,v 1.6 2009/09/25 11:10:21 tron Exp $ + +Patch for the vulnerability reported in SA36760, taken from here: + +http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=ebbccbaa5e925c2ddb212559f82c29ef526cc17e +http://git.ffmpeg.org/?p=ffmpeg;a=commit;h=7798d31bee361724e0a6ede4e2fd67228f24040b + +--- libavformat/sierravmd.c.orig 2009-02-16 14:45:05.000000000 +0000 ++++ libavformat/sierravmd.c 2009-09-25 11:49:56.000000000 +0100 +@@ -154,7 +154,7 @@ + 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 / sizeof(vmd_frame) - sound_buffers){ + av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); + return -1; + } |