[pkgsrc/trunk]: pkgsrc/multimedia Add fix for a crash / stack corruption with...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f0168a25fc38
branches:  trunk
changeset: 541040:f0168a25fc38
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 14 06:55:47 2008 +0000

description:
Add fix for a crash / stack corruption with ASS. Bump revision.

diffstat:

 multimedia/mplayer-share/distinfo         |   3 ++-
 multimedia/mplayer-share/patches/patch-ak |  17 +++++++++++++++++
 multimedia/mplayer/Makefile               |   4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 498f9949bb2e -r f0168a25fc38 multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Mon Apr 14 05:45:23 2008 +0000
+++ b/multimedia/mplayer-share/distinfo Mon Apr 14 06:55:47 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2008/02/26 18:14:30 tnn Exp $
+$NetBSD: distinfo,v 1.49 2008/04/14 06:55:47 joerg Exp $
 
 SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
 RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
@@ -13,6 +13,7 @@
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-ai) = ec79d6a1b0c2790ca826a91a48040c64632ac988
 SHA1 (patch-aj) = 772d083dfa5eac789abfd5e925eeeba400bbc527
+SHA1 (patch-ak) = 072b4391e5fde58f6b01bd43133f1d017fc14d58
 SHA1 (patch-ba) = 2683c414fed3a4a6d3b4d47287f43d822339bd4e
 SHA1 (patch-bb) = 26d000bcbc94b9139e6dbc79237fdb3a109c6057
 SHA1 (patch-bc) = fd46ce3cd6d5f7525e210cf6d475b89573ca988d
diff -r 498f9949bb2e -r f0168a25fc38 multimedia/mplayer-share/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ak Mon Apr 14 06:55:47 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.5 2008/04/14 06:55:47 joerg Exp $
+
+Fix crashes when rendering ASS and no TrueType font has been found.
+This crash can be hidden by large stack sizes. It is not known whether
+this issue is exploitable.
+
+--- libass/ass_font.c.orig     2007-10-07 21:49:31.000000000 +0200
++++ libass/ass_font.c
+@@ -294,6 +294,8 @@ FT_Glyph ass_font_get_glyph(void* fontco
+               mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_GlyphNotFoundReselectingFont,
+                      ch, font->desc.family, font->desc.bold, font->desc.italic);
+               face_idx = add_face(fontconfig_priv, font, ch);
++              if (face_idx == -1)
++                      return 0;
+               face = font->faces[face_idx];
+               index = FT_Get_Char_Index(face, ch);
+               if (index == 0) {
diff -r 498f9949bb2e -r f0168a25fc38 multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Mon Apr 14 05:45:23 2008 +0000
+++ b/multimedia/mplayer/Makefile       Mon Apr 14 06:55:47 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2008/03/16 11:56:49 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2008/04/14 06:55:47 joerg Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder