[ooo-build-commit] .: patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply               |    1 +
 patches/dev300/sw-ww8font-fix.diff |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit 9dfad52bb873d48937ef4a829933312d909b4b0a
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Thu Apr 8 15:30:47 2010 +0200

    Fixed a crash in .doc files import
    
    * patches/dev300/apply:
    * patches/dev300/sw-ww8font-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0b3a6e9..93f6970 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -697,6 +697,7 @@ sfx2-qstartfixes.diff, i#108846, caolan
 [ WriterFixes ]
 # Some WW8 fields weren't imported at all
 sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
+sw-ww8font-fix.diff, cbosdo
 
 [ WriterFixes < ooo320-m12 ]
 sw-uno-fix.diff, i#108426, cbosdo
diff --git a/patches/dev300/sw-ww8font-fix.diff b/patches/dev300/sw-ww8font-fix.diff
new file mode 100644
index 0000000..f9a4941
--- /dev/null
+++ b/patches/dev300/sw-ww8font-fix.diff
@@ -0,0 +1,24 @@
+diff --git sw/source/filter/ww8/ww8scan.cxx sw/source/filter/ww8/ww8scan.cxx
+index f4707a5..250fdbd 100644
+--- sw/source/filter/ww8/ww8scan.cxx
++++ sw/source/filter/ww8/ww8scan.cxx
+@@ -35,6 +35,7 @@
+ 
+ 
+ #include <functional>
++#include <algorithm>
+ 
+ #include <string.h>         // memset()
+ #include <rtl/tencinfo.h>
+@@ -6402,8 +6403,10 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
+ #ifdef __WW8_NEEDS_COPY
+                 {
+                     BYTE nLen = 0x28;
++                    BYTE nLength = sizeof( pVer8->szFfn ) / sizeof( SVBT16 );
++                    nLength = std::min( nLength, BYTE( pVer8->cbFfnM1+1 ) );
+                     for( UINT16* pTmp = pVer8->szFfn;
+-                        nLen < pVer8->cbFfnM1 + 1 ; ++pTmp, nLen+=2 )
++                        nLen < nLength; ++pTmp, nLen+=2 )
+                     {
+                         *pTmp = SVBT16ToShort( *(SVBT16*)pTmp );
+                     }