Apply fix for security problem CAN-2005-0941 from OOo CVS.

Bump PKGREVISION.
This commit is contained in:
mrauch 2005-04-14 20:48:58 +00:00
parent 44805c8fcb
commit e5e737f767
3 changed files with 17 additions and 3 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.62 2005/04/11 21:46:38 tv Exp $ # $NetBSD: Makefile,v 1.63 2005/04/14 20:48:58 mrauch Exp $
DISTNAME= openoffice-1.1.4 DISTNAME= openoffice-1.1.4
PKGREVISION= 1 PKGREVISION= 2
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.4/} MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.4/}
DISTFILES= OOo_1.1.4_source.tar.gz DISTFILES= OOo_1.1.4_source.tar.gz

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.30 2005/04/12 01:10:45 rillig Exp $ $NetBSD: distinfo,v 1.31 2005/04/14 20:48:58 mrauch Exp $
SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430 SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430
RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587 RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587
@ -55,3 +55,4 @@ SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8
SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1 SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1
SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364 SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364
SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849 SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849
SHA1 (patch-az) = 2c53d79f5d78aebefc4bc43a7f95b484cadd674a

View file

@ -0,0 +1,13 @@
$NetBSD: patch-az,v 1.3 2005/04/14 20:48:58 mrauch Exp $
--- ../sot/source/sdstor/stgole.cxx.orig 2002-07-22 14:28:43.000000000 +0200
+++ ../sot/source/sdstor/stgole.cxx
@@ -156,6 +156,8 @@ BOOL StgCompObjStream::Load()
*this >> aClsId;
INT32 nLen1 = 0;
*this >> nLen1;
+ // the higher bits are ignored
+ nLen1 &= 0xFFFF;
sal_Char* p = new sal_Char[ (USHORT) nLen1 ];
if( Read( p, nLen1 ) == (ULONG) nLen1 )
{