rpms/openoffice.org/FC-3 patches-OOO_1_1-sot-overflow.diff, NONE, 1.1 openoffice.org.spec, 1.61, 1.62 redhat-fixes.patch, 1.34, 1.35

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 12 14:16:45 UTC 2005 

Update of /cvs/dist/rpms/openoffice.org/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv23093

Modified Files:
	openoffice.org.spec redhat-fixes.patch 
Added Files:
	patches-OOO_1_1-sot-overflow.diff 
Log Message:
* Tue Apr 12 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-11
- Fix CAN-2005-0941 (sot module overflow in .doc parsing)



patches-OOO_1_1-sot-overflow.diff:
 stgole.cxx |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE patches-OOO_1_1-sot-overflow.diff ---
RCS file: /opt/sourcecast/data/ccvs/repository/util/sot/source/sdstor/stgole.cxx,v
retrieving revision 1.4
retrieving revision 1.4.206.1
diff -u -r1.4 -r1.4.206.1
--- sot/source/sdstor/stgole.cxx	2002/07/22 12:28:43	1.4
+++ sot/source/sdstor/stgole.cxx	2005/04/11 16:22:26	1.4.206.1
@@ -156,6 +156,8 @@
 		*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 )
 		{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/openoffice.org.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- openoffice.org.spec	6 Apr 2005 14:37:04 -0000	1.61
+++ openoffice.org.spec	12 Apr 2005 14:16:42 -0000	1.62
@@ -214,6 +214,9 @@
 # and Debian #284096
 Patch23: patches-OOO_1_1-psprint-nocupsupdates.diff
 
+# Fix CAN-2005-0941 (sot module overflow in .doc parsing)
+Patch24: patches-OOO_1_1-sot-overflow.diff
+
 ##################################
 # Description
 ##################################
@@ -299,6 +302,7 @@
 ln -s %{PATCH21} patches/OOO_1_1/
 ln -s %{PATCH22} patches/vclplug/
 ln -s %{PATCH23} patches/OOO_1_1/
+ln -s %{PATCH24} patches/OOO_1_1/
 
 # autogen here only needed when sources come from intermediate CVS releases,
 # not release from ooo.ximian.com
@@ -565,6 +569,9 @@
 # Changelog
 ##################################
 %changelog
+* Tue Apr 12 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-11
+- Fix CAN-2005-0941 (sot module overflow in .doc parsing)
+
 * Wed Apr  6 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-10
 - #rh137398# [iiimgcf] general event handling - gtk_im_context_reset()
 - #rh144557# (IIIMF canna) oocalc TAB fails to cancel preedit

redhat-fixes.patch:
 bin/build-ooo                                         |   30 ++++++++++++
 bin/install-dictionaries                              |   44 +-----------------
 bin/ooo-wrapper.in                                    |   40 ----------------
 configure.in                                          |    4 -
 patches/OOO_1_1/gui-menu-new-wizard-translations.diff |   39 ---------------
 patches/OOO_1_1/sc-filter-hide-filteredrows.diff      |    1 
 patches/OOO_1_1_3/apply                               |   19 ++++++-
 7 files changed, 53 insertions(+), 124 deletions(-)

Index: redhat-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/redhat-fixes.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- redhat-fixes.patch	6 Apr 2005 14:37:04 -0000	1.34
+++ redhat-fixes.patch	12 Apr 2005 14:16:42 -0000	1.35
@@ -1,5 +1,5 @@
 --- ooo-build-cvs20050205/bin/install-dictionaries.rh	2004-09-17 15:04:23.000000000 -0400
-+++ ooo-build-cvs20050205/bin/install-dictionaries	2005-04-05 10:12:55.000000000 -0400
++++ ooo-build-cvs20050205/bin/install-dictionaries	2005-04-06 10:37:38.000000000 -0400
 @@ -10,59 +10,23 @@
  
  
@@ -73,7 +73,7 @@
  done
  
 --- ooo-build-cvs20050205/bin/build-ooo.rh	2004-12-20 16:30:32.000000000 -0500
-+++ ooo-build-cvs20050205/bin/build-ooo	2005-04-05 10:12:55.000000000 -0400
++++ ooo-build-cvs20050205/bin/build-ooo	2005-04-06 10:37:38.000000000 -0400
 @@ -103,11 +103,41 @@
  # similar that gives child nmake's pain.
  unset MAKEFLAGS
@@ -117,7 +117,7 @@
  OOO_REBUILD_NEEDED="yes"
  OOO_ICONS_VERS_TO_BUILD="$OOO_ICONS_VERS"
 --- ooo-build-cvs20050205/bin/ooo-wrapper.in.rh	2004-09-13 16:52:21.000000000 -0400
-+++ ooo-build-cvs20050205/bin/ooo-wrapper.in	2005-04-05 10:12:55.000000000 -0400
++++ ooo-build-cvs20050205/bin/ooo-wrapper.in	2005-04-06 10:37:38.000000000 -0400
 @@ -228,17 +228,12 @@
  # Parse command line arguments
  my @ooo_argv;
@@ -179,7 +179,7 @@
  {
      if ( -r "$VersionFile" ) {
 --- ooo-build-cvs20050205/patches/OOO_1_1/gui-menu-new-wizard-translations.diff.rh	2003-09-25 11:05:33.000000000 -0400
-+++ ooo-build-cvs20050205/patches/OOO_1_1/gui-menu-new-wizard-translations.diff	2005-04-05 10:12:55.000000000 -0400
++++ ooo-build-cvs20050205/patches/OOO_1_1/gui-menu-new-wizard-translations.diff	2005-04-06 10:37:38.000000000 -0400
 @@ -3,9 +3,9 @@
  RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
  retrieving revision 1.13
@@ -236,7 +236,7 @@
  +    <prop oor:name="ImageIdentifier" oor:type="xs:string">
  +     <value>private:image/3216</value>
 --- ooo-build-cvs20050205/patches/OOO_1_1/sc-filter-hide-filteredrows.diff.rh	2004-10-13 06:32:34.000000000 -0400
-+++ ooo-build-cvs20050205/patches/OOO_1_1/sc-filter-hide-filteredrows.diff	2005-04-05 10:12:55.000000000 -0400
++++ ooo-build-cvs20050205/patches/OOO_1_1/sc-filter-hide-filteredrows.diff	2005-04-06 10:37:38.000000000 -0400
 @@ -7,7 +7,7 @@
  -			for (i=nStartRow; i<=nEndRow; i++)
  -				pRowFlags[i] &= ~(CR_HIDDEN | CR_FILTERED);
@@ -247,7 +247,7 @@
  +				}
   		else
 --- ooo-build-cvs20050205/patches/OOO_1_1_3/apply.rh	2005-02-02 10:03:28.000000000 -0500
-+++ ooo-build-cvs20050205/patches/OOO_1_1_3/apply	2005-04-06 10:30:13.926904963 -0400
++++ ooo-build-cvs20050205/patches/OOO_1_1_3/apply	2005-04-12 09:46:12.194051558 -0400
 @@ -24,7 +24,7 @@
  FedoraCore1 : RedHatBase
  FedoraCore2 : RedHatBase, FilePickers
@@ -280,7 +280,17 @@
  [ FilePickers ]
  
  #
-@@ -753,6 +758,9 @@
+@@ -461,6 +466,9 @@
+ # Make Tools->Options less confused in pt_BR locales #rh124877#
+ tools-options-pt_BR-fix.diff
+ 
++# Fix CAN-2005-0941 (overflow in sot module .doc parsing code)
++patches-OOO_1_1-sot-overflow.diff
++
+ [ GnomeVFS ]
+ 
+ # New VFS provider stuff ..
+@@ -753,6 +761,9 @@
  sw-autopilot-fallback-to-vor.diff
  sw-template-fallback-to-english.diff
  
@@ -290,7 +300,7 @@
  # Fix a crasher in online layout mode #rh137969#
  sw-online-layout-crash-fix.diff
  
-@@ -779,7 +787,7 @@
+@@ -779,7 +790,7 @@
  sw-menu-syntax-fix.diff
  
  # Make the default translation language be English rather than German
@@ -300,7 +310,7 @@
  [ LinuxOnly ]
  
 --- ooo-build-cvs20050205/configure.in.rh	2005-02-01 13:19:41.000000000 -0500
-+++ ooo-build-cvs20050205/configure.in	2005-04-05 10:12:55.000000000 -0400
++++ ooo-build-cvs20050205/configure.in	2005-04-06 10:37:38.000000000 -0400
 @@ -94,7 +94,7 @@
  			  specify the suffix to be used on the end of script
  			  names, to allow parallel installation of two versions.

More information about the fedora-cvs-commits mailing list