[arch-commits] Commit in freetype2/repos (4 files)
Ionut Biru
ibiru at archlinux.org
Thu Nov 5 19:38:37 UTC 2009
Date: Thursday, November 5, 2009 @ 14:38:36
Author: ibiru
Revision: 58183
Merged revisions 58137-58138 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/freetype2/trunk
........
r58137 | jgc | 2009-11-04 13:54:42 +0200 (Wed, 04 Nov 2009) | 1 line
Update to 2.3.11, remove upstream included patch
........
r58138 | jgc | 2009-11-04 13:55:15 +0200 (Wed, 04 Nov 2009) | 1 line
Remove another old patch
........
Modified:
freetype2/repos/extra-i686/ (properties)
freetype2/repos/extra-i686/PKGBUILD
Deleted:
freetype2/repos/extra-i686/CVE-2009-0946.patch
freetype2/repos/extra-i686/freetype-2.3.3-ftbitmap.patch
-------------------------------+
CVE-2009-0946.patch | 144 ----------------------------------------
PKGBUILD | 22 ++----
freetype-2.3.3-ftbitmap.patch | 25 ------
3 files changed, 10 insertions(+), 181 deletions(-)
Property changes on: freetype2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /freetype2/trunk:1-37396
+ /freetype2/trunk:1-58182
Deleted: extra-i686/CVE-2009-0946.patch
===================================================================
--- extra-i686/CVE-2009-0946.patch 2009-11-05 19:35:39 UTC (rev 58182)
+++ extra-i686/CVE-2009-0946.patch 2009-11-05 19:38:36 UTC (rev 58183)
@@ -1,144 +0,0 @@
-
-diff --git a/src/cff/cffload.c b/src/cff/cffload.c
-index 22163fb..24b899d 100644
---- a/src/cff/cffload.c
-+++ b/src/cff/cffload.c
-@@ -842,7 +842,20 @@
- goto Exit;
-
- for ( j = 1; j < num_glyphs; j++ )
-- charset->sids[j] = FT_GET_USHORT();
-+ {
-+ FT_UShort sid = FT_GET_USHORT();
-+
-+
-+ /* this constant is given in the CFF specification */
-+ if ( sid < 65000 )
-+ charset->sids[j] = sid;
-+ else
-+ {
-+ FT_ERROR(( "cff_charset_load:"
-+ " invalid SID value %d set to zero\n", sid ));
-+ charset->sids[j] = 0;
-+ }
-+ }
-
- FT_FRAME_EXIT();
- }
-@@ -875,6 +888,20 @@
- goto Exit;
- }
-
-+ /* check whether the range contains at least one valid glyph; */
-+ /* the constant is given in the CFF specification */
-+ if ( glyph_sid >= 65000 ) {
-+ FT_ERROR(( "cff_charset_load: invalid SID range\n" ));
-+ error = CFF_Err_Invalid_File_Format;
-+ goto Exit;
-+ }
-+
-+ /* try to rescue some of the SIDs if `nleft' is too large */
-+ if ( nleft > 65000 - 1 || glyph_sid >= 65000 - nleft ) {
-+ FT_ERROR(( "cff_charset_load: invalid SID range trimmed\n" ));
-+ nleft = 65000 - 1 - glyph_sid;
-+ }
-+
- /* Fill in the range of sids -- `nleft + 1' glyphs. */
- for ( i = 0; j < num_glyphs && i <= nleft; i++, j++, glyph_sid++ )
- charset->sids[j] = glyph_sid;
-diff --git a/src/lzw/ftzopen.c b/src/lzw/ftzopen.c
-index fc78315..c0483de 100644
---- a/src/lzw/ftzopen.c
-+++ b/src/lzw/ftzopen.c
-@@ -332,6 +332,9 @@
-
- while ( code >= 256U )
- {
-+ if ( !state->prefix )
-+ goto Eof;
-+
- FTLZW_STACK_PUSH( state->suffix[code - 256] );
- code = state->prefix[code - 256];
- }
-diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
-index 6830391..1bd2ce7 100644
---- a/src/sfnt/ttcmap.c
-+++ b/src/sfnt/ttcmap.c
-@@ -1635,7 +1635,7 @@
- FT_INVALID_TOO_SHORT;
-
- length = TT_NEXT_ULONG( p );
-- if ( table + length > valid->limit || length < 8208 )
-+ if ( length > (FT_UInt32)( valid->limit - table ) || length < 8192 + 16 )
- FT_INVALID_TOO_SHORT;
-
- is32 = table + 12;
-@@ -1863,7 +1863,8 @@
- p = table + 16;
- count = TT_NEXT_ULONG( p );
-
-- if ( table + length > valid->limit || length < 20 + count * 2 )
-+ if ( length > (FT_ULong)( valid->limit - table ) ||
-+ length < 20 + count * 2 )
- FT_INVALID_TOO_SHORT;
-
- /* check glyph indices */
-@@ -2048,7 +2049,8 @@
- p = table + 12;
- num_groups = TT_NEXT_ULONG( p );
-
-- if ( table + length > valid->limit || length < 16 + 12 * num_groups )
-+ if ( length > (FT_ULong)( valid->limit - table ) ||
-+ length < 16 + 12 * num_groups )
- FT_INVALID_TOO_SHORT;
-
- /* check groups, they must be in increasing order */
-@@ -2429,7 +2431,8 @@
- FT_ULong num_selectors = TT_NEXT_ULONG( p );
-
-
-- if ( table + length > valid->limit || length < 10 + 11 * num_selectors )
-+ if ( length > (FT_ULong)( valid->limit - table ) ||
-+ length < 10 + 11 * num_selectors )
- FT_INVALID_TOO_SHORT;
-
- /* check selectors, they must be in increasing order */
-@@ -2491,7 +2494,7 @@
- FT_ULong i, lastUni = 0;
-
-
-- if ( ndp + numMappings * 4 > valid->limit )
-+ if ( numMappings * 4 > (FT_ULong)( valid->limit - ndp ) )
- FT_INVALID_TOO_SHORT;
-
- for ( i = 0; i < numMappings; ++i )
-diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c
-index a6db504..cacc490 100644
---- a/src/smooth/ftsmooth.c
-+++ b/src/smooth/ftsmooth.c
-@@ -153,7 +153,7 @@
- slot->internal->flags &= ~FT_GLYPH_OWN_BITMAP;
- }
-
-- /* allocate new one, depends on pixel format */
-+ /* allocate new one */
- pitch = width;
- if ( hmul )
- {
-@@ -194,6 +194,13 @@
-
- #endif
-
-+ if ( pitch > 0xFFFF || height > 0xFFFF )
-+ {
-+ FT_ERROR(( "ft_smooth_render_generic: glyph too large: %d x %d\n",
-+ width, height ));
-+ return Smooth_Err_Raster_Overflow;
-+ }
-+
- bitmap->pixel_mode = FT_PIXEL_MODE_GRAY;
- bitmap->num_grays = 256;
- bitmap->width = width;
---
-cgit v0.8.2.1
-
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-11-05 19:35:39 UTC (rev 58182)
+++ extra-i686/PKGBUILD 2009-11-05 19:38:36 UTC (rev 58183)
@@ -1,8 +1,9 @@
# $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
pkgname=freetype2
-pkgver=2.3.9
-pkgrel=2
+pkgver=2.3.11
+pkgrel=1
pkgdesc="TrueType font rendering library"
arch=(i686 x86_64)
license=('GPL')
@@ -10,17 +11,15 @@
depends=('zlib')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
- bytecode.patch
- freetype-2.3.0-enable-spr.patch
- freetype-2.2.1-enable-valid.patch
- freetype-2.2.1-memcpy-fix.patch
- CVE-2009-0946.patch)
-md5sums=('d76233108aca9c9606cdbd341562ad9a'
+ bytecode.patch
+ freetype-2.3.0-enable-spr.patch
+ freetype-2.2.1-enable-valid.patch
+ freetype-2.2.1-memcpy-fix.patch)
+md5sums=('519c7cbf5cbd72ffa822c66844d3114c'
'9ff19e742968c29e3ba52b08d6bf0a50'
'816dc8619a6904a7385769433c0a8653'
'214119610444c9b02766ccee5e220680'
- '6fb6606d28082ecb8e0c6d986b0b26aa'
- '3322c8f8266f7f3dcafb7205ad433c05')
+ '6fb6606d28082ecb8e0c6d986b0b26aa')
build() {
cd "${srcdir}/freetype-${pkgver}"
@@ -28,7 +27,6 @@
patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" || return 1
patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" || return 1
patch -Np1 -i "${srcdir}/freetype-2.2.1-memcpy-fix.patch" || return 1
- patch -Np1 -i "${srcdir}/CVE-2009-0946.patch" || return 1
./configure --prefix=/usr || return 1
make || return 1
Deleted: extra-i686/freetype-2.3.3-ftbitmap.patch
===================================================================
--- extra-i686/freetype-2.3.3-ftbitmap.patch 2009-11-05 19:35:39 UTC (rev 58182)
+++ extra-i686/freetype-2.3.3-ftbitmap.patch 2009-11-05 19:38:36 UTC (rev 58183)
@@ -1,25 +0,0 @@
-===================================================================
-RCS file: /var/lib/cvs/sources/freetype/freetype2/src/base/ftbitmap.c,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -u -r1.17 -r1.18
---- freetype/freetype2/src/base/ftbitmap.c 2007/03/29 11:56:21 1.17
-+++ freetype/freetype2/src/base/ftbitmap.c 2007/04/06 08:19:04 1.18
-@@ -149,15 +149,15 @@
- if ( bit_last < bit_width )
- {
- FT_Byte* line = bitmap->buffer + ( bit_last >> 3 );
-+ FT_Byte* end = bitmap->buffer + pitch;
- FT_Int shift = bit_last & 7;
- FT_UInt mask = 0xFF00U >> shift;
- FT_Int count = height;
-
-
-- for ( ; count > 0; count--, line += pitch )
-+ for ( ; count > 0; count--, line += pitch, end += pitch )
- {
- FT_Byte* write = line;
-- FT_Byte* end = line + pitch;
-
-
- if ( shift > 0 )
More information about the arch-commits
mailing list