Add a patch to fix CVE-2010-0421, DoS security fix. Bump PKGREVISION.diff -r1.140 -r1.141 pkgsrc/devel/pango/Makefile
(taca)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.140 2010/02/21 23:51:25 tron Exp $ | 1 | # $NetBSD: Makefile,v 1.141 2010/03/27 15:59:33 taca Exp $ | |
2 | 2 | |||
3 | DISTNAME= pango-1.26.2 | 3 | DISTNAME= pango-1.26.2 | |
4 | PKGREVISION= 1 | 4 | PKGREVISION= 2 | |
5 | CATEGORIES= devel fonts | 5 | CATEGORIES= devel fonts | |
6 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.26/} | 6 | MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.26/} | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.pango.org/ | 10 | HOMEPAGE= http://www.pango.org/ | |
11 | COMMENT= Library for layout and rendering of text | 11 | COMMENT= Library for layout and rendering of text | |
12 | LICENSE= gnu-lgpl-v2 | 12 | LICENSE= gnu-lgpl-v2 | |
13 | 13 | |||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | USE_TOOLS+= gmake pkg-config | 17 | USE_TOOLS+= gmake pkg-config |
@@ -1,8 +1,9 @@ | @@ -1,8 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.82 2010/02/21 23:51:25 tron Exp $ | 1 | $NetBSD: distinfo,v 1.83 2010/03/27 15:59:33 taca Exp $ | |
2 | 2 | |||
3 | SHA1 (pango-1.26.2.tar.bz2) = 051b6f7b5f98a4c8083ef6a5178cb5255a992b98 | 3 | SHA1 (pango-1.26.2.tar.bz2) = 051b6f7b5f98a4c8083ef6a5178cb5255a992b98 | |
4 | RMD160 (pango-1.26.2.tar.bz2) = 6613bddf643d5c912e6656d84c6671aa6ce88a9d | 4 | RMD160 (pango-1.26.2.tar.bz2) = 6613bddf643d5c912e6656d84c6671aa6ce88a9d | |
5 | Size (pango-1.26.2.tar.bz2) = 1536011 bytes | 5 | Size (pango-1.26.2.tar.bz2) = 1536011 bytes | |
6 | SHA1 (patch-aa) = 1a87d055dc722eff28517a11d0832ae19df5eb59 | 6 | SHA1 (patch-aa) = 1a87d055dc722eff28517a11d0832ae19df5eb59 | |
7 | SHA1 (patch-ab) = 12c09b12ba31be19fa0d602f89909811e6221bd8 | 7 | SHA1 (patch-ab) = 12c09b12ba31be19fa0d602f89909811e6221bd8 | |
8 | SHA1 (patch-ae) = 9eb458be84f6dfce27fb469d45cc78e34acd9c36 | 8 | SHA1 (patch-ae) = 9eb458be84f6dfce27fb469d45cc78e34acd9c36 | |
9 | SHA1 (patch-am) = dc7387b4da24356a56ab8d07ef0462b6f4b3b209 |
$NetBSD: patch-am,v 1.1 2010/03/27 15:59:34 taca Exp $
Fix for CVE-2010-0421.
--- pango/opentype/hb-ot-layout.cc.orig 2009-11-26 00:44:17.000000000 +0000
+++ pango/opentype/hb-ot-layout.cc
@@ -44,6 +44,8 @@ _hb_ot_layout_init (hb_face_t *face)
{
hb_ot_layout_t *layout = &face->ot_layout;
+ memset (layout, 0, sizeof (*layout));
+
layout->gdef_blob = Sanitizer<GDEF>::sanitize (hb_face_get_table (face, HB_OT_TAG_GDEF));
layout->gdef = &Sanitizer<GDEF>::lock_instance (layout->gdef_blob);
@@ -293,7 +295,7 @@ hb_ot_layout_build_glyph_classes (hb_fac
return;
if (layout->new_gdef.len == 0) {
- layout->new_gdef.klasses = (unsigned char *) calloc (num_total_glyphs, sizeof (unsigned char));
+ layout->new_gdef.klasses = (unsigned char *) calloc (count, sizeof (unsigned char));
layout->new_gdef.len = count;
}