diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-04-18 01:31:58 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-04-18 01:31:58 +0000 |
| commit | ce4a85420196428bc5abfd406a2137528f80b76d (patch) | |
| tree | 59a073938183e1525b0db41946809db6ad085d72 /editors/openoffice-1.1 | |
| parent | Integrate the following vendor patches as published on (diff) | |
Security advisory: OpenOffice DOC document Heap Overflow
http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8387
I obtaiend the fix from:
http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8417
Bump portrevision accordingly
Notes
Notes:
svn path=/head/; revision=133552
Diffstat (limited to 'editors/openoffice-1.1')
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 42e3e65c76e3..a53e150db7d6 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -7,7 +7,7 @@ PORTNAME= openoffice PORTVERSION= 1.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/&,} \ ${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \ diff --git a/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx b/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx new file mode 100644 index 000000000000..748c13bdf642 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-sot+source+sdstor+stgole.cxx @@ -0,0 +1,21 @@ +OpenOffice DOC document Heap Overflow +o http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8387 +o http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=8417 +http://util.openoffice.org/source/browse/util/sot/source/sdstor/stgole.cxx?r1=1.4&r2=1.4.166.1 + +Index: sot/source/sdstor/stgole.cxx +=================================================================== +RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v +retrieving revision 1.4 +diff -u -r1.4 stgole.cxx +--- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 ++++ sot/source/sdstor/stgole.cxx 18 Apr 2005 01:34:25 -0000 +@@ -156,6 +156,8 @@ + *this >> aClsId; + INT32 nLen1 = 0; + *this >> nLen1; ++ // higher bits are ignored ++ nLen1 &= 0xFFFF; + sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; + if( Read( p, nLen1 ) == (ULONG) nLen1 ) + { |