diff options
author | tron <tron> | 2006-01-25 20:06:33 +0000 |
---|---|---|
committer | tron <tron> | 2006-01-25 20:06:33 +0000 |
commit | c25a165302765265695a2db8741b670b9c2f1639 (patch) | |
tree | aacfed80d20729e487397a7181d2cba4a076afa0 /multimedia/xine-lib | |
parent | 3fef38cbeb4d8f95a52e74db95f4cbcccda7925b (diff) | |
download | pkgsrc-c25a165302765265695a2db8741b670b9c2f1639.tar.gz |
Backport security fix for CVE-2005-4048 to our old "xine-lib" version.
Bump package revision.
Diffstat (limited to 'multimedia/xine-lib')
-rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 3 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-aq | 83 |
3 files changed, 87 insertions, 3 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 337541c28e8..4d2bc50290d 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2005/12/24 12:49:35 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2006/01/25 20:06:33 tron Exp $ .include "Makefile.common" -PKGREVISION= 3 +PKGREVISION= 4 COMMENT= Multimedia player library diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 2c1db51898a..ea523ea3b75 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2005/11/01 06:15:33 reed Exp $ +$NetBSD: distinfo,v 1.27 2006/01/25 20:06:33 tron Exp $ SHA1 (xine-lib-1.0.3a.tar.gz) = 2efe9bc3d85659731e8c679d2c60901a6101f17b RMD160 (xine-lib-1.0.3a.tar.gz) = 335abfaa46c4592a22246f75c3a455cd87b7cdc4 @@ -18,6 +18,7 @@ SHA1 (patch-al) = f78b16bb84b3748c01c50d258c24fccfb19910b4 SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16 SHA1 (patch-ao) = c5bbffceb34516951d2f19558bb6e082376ab195 SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f +SHA1 (patch-aq) = 6f486b79dcb14155f613df44b10ef8223b44167e SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30 SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa diff --git a/multimedia/xine-lib/patches/patch-aq b/multimedia/xine-lib/patches/patch-aq new file mode 100644 index 00000000000..4522dd8506b --- /dev/null +++ b/multimedia/xine-lib/patches/patch-aq @@ -0,0 +1,83 @@ +$NetBSD: patch-aq,v 1.6 2006/01/25 20:06:33 tron Exp $ + +--- src/libffmpeg/libavcodec/utils.c.orig 2004-05-30 20:24:23.000000000 +0100 ++++ src/libffmpeg/libavcodec/utils.c 2006-01-25 19:55:16.000000000 +0000 +@@ -200,27 +200,11 @@ + buf->last_pic_num= *picture_number; + }else{ + int h_chroma_shift, v_chroma_shift; +- int s_align, pixel_size; +- ++ int s_align, pixel_size, size[3]; ++ AVPicture picture; ++ + avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); + +- switch(s->pix_fmt){ +- case PIX_FMT_RGB555: +- case PIX_FMT_RGB565: +- case PIX_FMT_YUV422: +- pixel_size=2; +- break; +- case PIX_FMT_RGB24: +- case PIX_FMT_BGR24: +- pixel_size=3; +- break; +- case PIX_FMT_RGBA32: +- pixel_size=4; +- break; +- default: +- pixel_size=1; +- } +- + avcodec_align_dimensions(s, &w, &h); + #if defined(ARCH_POWERPC) || defined(HAVE_MMI) //FIXME some cleaner check + s_align= 16; +@@ -232,21 +216,39 @@ + w+= EDGE_WIDTH*2; + h+= EDGE_WIDTH*2; + } +- ++ avpicture_fill(&picture, NULL, s->pix_fmt, w, h); ++ pixel_size= picture.linesize[0]*8 / w; ++//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt); ++ assert(pixel_size>=1); ++ //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it ++ if(pixel_size == 3*8) ++ w= ALIGN(w, s_align<<h_chroma_shift); ++ else ++ w= ALIGN(pixel_size*w, s_align<<(h_chroma_shift+3)) / pixel_size; ++ size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h); ++ size[0] = picture.linesize[0] * h; ++ size[1] -= size[0]; ++ if(picture.data[2]) ++ size[1]= size[2]= size[1]/2; ++ else ++ size[2]= 0; ++ + buf->last_pic_num= -256*256*256*64; ++ memset(buf->base, 0, sizeof(buf->base)); ++ memset(buf->data, 0, sizeof(buf->data)); + +- for(i=0; i<3; i++){ ++ for(i=0; i<3 && size[i]; i++){ + const int h_shift= i==0 ? 0 : h_chroma_shift; + const int v_shift= i==0 ? 0 : v_chroma_shift; + +- //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it +- buf->linesize[i]= ALIGN(pixel_size*w>>h_shift, s_align<<(h_chroma_shift-h_shift)); ++ buf->linesize[i]= picture.linesize[i]; + +- buf->base[i]= av_mallocz((buf->linesize[i]*h>>v_shift)+16); //FIXME 16 ++ buf->base[i]= av_malloc(size[i]+16); //FIXME 16 + if(buf->base[i]==NULL) return -1; +- memset(buf->base[i], 128, buf->linesize[i]*h>>v_shift); +- +- if(s->flags&CODEC_FLAG_EMU_EDGE) ++ memset(buf->base[i], 128, size[i]); ++ ++ // no edge if EDEG EMU or not planar YUV, we check for PAL8 redundantly to protect against a exploitable bug regression ... ++ if((s->flags&CODEC_FLAG_EMU_EDGE) || (s->pix_fmt == PIX_FMT_PAL8) || !size[2]) + buf->data[i] = buf->base[i]; + else + buf->data[i] = buf->base[i] + ALIGN((buf->linesize[i]*EDGE_WIDTH>>v_shift) + (EDGE_WIDTH>>h_shift), s_align); |