← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/openoffice.org/gutsy-updates

« back to all changes in this revision

Viewing changes to ooo-build/patches/src680/workspace.fwk82.diff

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Chris Cheney, Kees Cook
  • Date: 2008-04-21 17:35:13 UTC
  • mfrom: (87.1.3 gutsy-proposed)
  • Revision ID: james.westby@ubuntu.com-20080421173513-9pmadexneaqrtgrx
Tags: 1:2.3.0-1ubuntu5.4
[ Chris Cheney ]
* ooo-build/patches/src680/workspace.fwk82.diff,
  ooo-build/patches/src680/workspace.sjfixes03.diff: fix CVE-2007-5745,
  CVE-2007-5746,CVE-2007-5747 and CVE-2008-0320
* ooo-build/patches/src680/cws-jl85.diff: fix XML signing problem where
  the document can be manipulated so that the signature dialog display a
  false issuer

[ Kees Cook ]
* ooo-build/patches/src680/workspace.hsql1808.diff: upstream fixes for
  HSQLDB Java method calling (CVE-2007-4575), thanks to Caolan McNamara.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/src680/workspace.fwk82.diff
 
1
Index: util/sot/source/sdstor/stgelem.cxx
 
2
diff -u util/sot/source/sdstor/stgelem.cxx:1.9 util/sot/source/sdstor/stgelem.cxx:1.9.52.1
 
3
--- sot/source/sdstor/stgelem.cxx:1.9   Sun Sep 17 09:09:48 2006
 
4
+++ sot/source/sdstor/stgelem.cxx       Wed Jan  9 02:38:20 2008
 
5
@@ -388,8 +388,11 @@
 
6
     UINT16 n = nNameLen;
 
7
     if( n )
 
8
                n = ( n >> 1 ) - 1;
 
9
-       if( n > 31 )
 
10
+       if( n > 31 || nSize < 0 )
 
11
+    {
 
12
+        // TODO/LATER: actually the size should be an unsigned value, but in this case it would mean a stream of more than 2Gb
 
13
                return FALSE;
 
14
+    }
 
15
 
 
16
        aName = String( nName, n );
 
17
        // I don't know the locale, so en_US is hopefully fine
 
18