ooo-build r12753 - in trunk: . patches/dev300

[strba svn gnome org]

Author: strba
Date: Mon Jun  2 11:31:42 2008
New Revision: 12753
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12753&view=rev

Log:
prevent out of bounds in writing out tables by ww8 exporter (fixes n#391197)

Added:
   trunk/patches/dev300/sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun  2 11:31:42 2008
@@ -443,8 +443,8 @@
 # enable build debug=t in sw module on x86_64
 sw-debug-build.diff, fridrich
 
-# convert kind of correctly nested positioned tables
-# sw-nested-positionned-tables-ww8-import-fix.diff, i#86988, fridrich
+# prevent some array out of bounds in ww8 exporter
+sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff, n#391197, fridrich
 
 # init all members in svx's line geometry creator
 svx-missing-initialization.diff, i#86163, thorsten

Added: trunk/patches/dev300/sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff	Mon Jun  2 11:31:42 2008
@@ -0,0 +1,56 @@
+--- sw/source/filter/ww8/wrtw8nds.cxx	2008-06-02 11:37:38.000000000 +0200
++++ sw/source/filter/ww8/wrtw8nds.cxx	2008-06-02 13:07:41.000000000 +0200
+@@ -2391,7 +2391,7 @@
+         SwTwips nSz = 0, nCalc;
+         SwWW8Writer::InsUInt16( aAt, (USHORT)nTblOffset );
+ 
+-        for (nBox = 0, nRealBox = 0; nRealBox < nWWColMax; ++nBox)
++        for (nBox = 0, nRealBox = 0; nRealBox < nWWColMax && nBox < nColCnt; ++nBox)
+         {
+             if( (nBox > 0 && pBoxArr[ nBox-1 ] == pBoxArr[ nBox ])
+                 || pBoxArr[nBox] == NULL)
+@@ -2410,7 +2410,7 @@
+             ++nRealBox;
+         }
+ 
+-        for (nBox = 0, nRealBox = 0; nRealBox < nWWColMax; ++nBox)
++        for (nBox = 0, nRealBox = 0; nRealBox < nWWColMax && nBox < nColCnt; ++nBox)
+         {
+             if( nBox && pBoxArr[ nBox-1 ] == pBoxArr[ nBox ] )
+                 continue;
+@@ -2462,7 +2462,7 @@
+             const USHORT* pBrd = aBorders;
+ 
+             //Export non default border spacing
+-            for( nBox = 0, nRealBox = 0; nRealBox < nWWColMax; ++nBox)
++            for( nBox = 0, nRealBox = 0; nRealBox < nWWColMax && nBox < nColCnt; ++nBox)
+             {
+                 if( nBox && pBoxArr[ nBox-1 ] == pBoxArr[ nBox ] )
+                     continue;
+@@ -2487,7 +2487,7 @@
+             }
+ 
+             //Export any vertical direction cells
+-            for (nBox = 0, nRealBox = 0; nRealBox < nWWColMax; ++nBox)
++            for (nBox = 0, nRealBox = 0; nRealBox < nWWColMax && nBox < nColCnt; ++nBox)
+             {
+                 if( nBox && pBoxArr[nBox-1] == pBoxArr[nBox])
+                     continue;
+@@ -2529,7 +2529,7 @@
+         else
+         {
+             nBackg = 0;
+-            for( nBox = 0, nRealBox = 0; nRealBox < nWWColMax; ++nBox )
++            for( nBox = 0, nRealBox = 0; nRealBox < nWWColMax && nBox < nColCnt; ++nBox )
+             {
+                 if( nBox && pBoxArr[ nBox-1 ] == pBoxArr[ nBox ] )
+                     continue;
+@@ -2556,7 +2556,7 @@
+             Color *pColors = new Color[nBackg];
+ 
+             const SfxPoolItem* pI;
+-            for( nBox = 0, nRealBox = 0; nRealBox < nBackg; ++nBox )
++            for( nBox = 0, nRealBox = 0; nRealBox < nBackg && nBox < nColCnt; ++nBox )
+             {
+                 if( nBox && pBoxArr[ nBox-1 ] == pBoxArr[ nBox ] )
+                     continue;