[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                     |    1 +
 patches/dev300/sd-avoid-looping-fix.diff |   21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

New commits:
commit 3166bcd725b14481063e7de60f467069d892a852
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Feb 3 13:03:57 2010 +0100

    Avoid looping in draw/impress
    
    * patches/dev300/apply: added the patch
    * patches/dev300/sd-avoid-looping-fix.diff: fix a loop in the
      Atom ctor

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bd69901..b4bf73d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3525,6 +3525,7 @@ evaluation-row-limit.diff
 [ Fixes ]
 # TODO: split up into the original patches were this belongs
 valgrind-fixes.diff, thorsten
+sd-avoid-looping-fix.diff, thorsten
 
 [ Fixes < ooo320-m12 ]
 vcl-drawtransparent-fix.diff, i#107763, thorsten
diff --git a/patches/dev300/sd-avoid-looping-fix.diff b/patches/dev300/sd-avoid-looping-fix.diff
new file mode 100644
index 0000000..f347d4c
--- /dev/null
+++ b/patches/dev300/sd-avoid-looping-fix.diff
@@ -0,0 +1,21 @@
+diff --git a/sd/source/filter/ppt/pptatom.cpp b/sd/source/filter/ppt/pptatom.cpp
+index d519898..3374b1c 100644
+--- sd/source/filter/ppt/pptatom.cpp
++++ sd/source/filter/ppt/pptatom.cpp
+@@ -52,7 +52,15 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream )
+ 
+             Atom* pLastAtom = NULL;
+ 		
+-            while( (mrStream.GetError() == 0 ) && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) )
++            // retrieve file size (to allow sanity checks) 
++            const sal_Size nStreamPos = mrStream.Tell();
++            mrStream.Seek( STREAM_SEEK_TO_END );
++            const sal_Size nStreamSize = mrStream.Tell();
++            mrStream.Seek( nStreamPos );
++
++            while( (mrStream.GetError() == 0 ) 
++                   && ( mrStream.Tell() < nStreamSize )
++                   && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) )
+             {
+                 mrStream >> aChildHeader;
+