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

[Kohei Yoshida]

 patches/dev300/apply                                    |    6 ++++++
 patches/dev300/odf-export-invalid-memory-write-fix.diff |   12 ++++++++++++
 patches/dev300/vcl-uninitialized-val-fix.diff           |   12 ++++++++++++
 3 files changed, 30 insertions(+)

New commits:
commit 0c9945b029a3a47ae24287cb6f24a6c2779ed972
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Jan 12 23:55:27 2010 -0500

    Several fixes from valgrind test.
    
    * patches/dev300/apply: added two new patches.
    
    * patches/dev300/odf-export-invalid-memory-write-fix.diff: sax
      writer was writing bytes to invalid memory location, because the
      pointer to the buffer array was not updated after the array itself
      was reallocated.  That caused a nasty crash during export.  This
      patch hopefully fixes it.
    
    * patches/dev300/vcl-uninitialized-val-fix.diff: initialize a data
      member before it gets used.  Picked up by valgrind.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 45b9c64..dc99e2a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3319,6 +3319,12 @@ dlopen-global-symbols.diff, thorsten
 # fix crashes in afm parser
 vcl-afm-parser-fix.diff, n#535485, thorsten
 
+# initialize a data member before it gets used.
+vcl-uninitialized-val-fix.diff, kohei
+
+# update the buffer pointer after reallocation to prevent invalid memory writes.
+odf-export-invalid-memory-write-fix.diff, kohei
+
 [ NLPSolverBits ]
 # build NLPSolver extension when enabled (fate#304653)
 postprocess-nlpsolver.diff, pmladek
diff --git a/patches/dev300/odf-export-invalid-memory-write-fix.diff b/patches/dev300/odf-export-invalid-memory-write-fix.diff
new file mode 100644
index 0000000..c86fa3e
--- /dev/null
+++ b/patches/dev300/odf-export-invalid-memory-write-fix.diff
@@ -0,0 +1,12 @@
+diff --git sax/source/expatwrap/saxwriter.cxx sax/source/expatwrap/saxwriter.cxx
+index f208ee6..11311ef 100644
+--- sax/source/expatwrap/saxwriter.cxx
++++ sax/source/expatwrap/saxwriter.cxx
+@@ -703,6 +703,7 @@ inline void SaxWriterHelper::clearBuffer() throw( SAXException )
+         m_Sequence.realloc(nCurrentPos);
+         nCurrentPos = writeSequence();
+         m_Sequence.realloc(SEQUENCESIZE);
++        mp_Sequence = m_Sequence.getArray();
+     }
+ }
+ 
diff --git a/patches/dev300/vcl-uninitialized-val-fix.diff b/patches/dev300/vcl-uninitialized-val-fix.diff
new file mode 100644
index 0000000..3d52d24
--- /dev/null
+++ b/patches/dev300/vcl-uninitialized-val-fix.diff
@@ -0,0 +1,12 @@
+diff --git vcl/source/window/status.cxx vcl/source/window/status.cxx
+index 28967d2..49b16a2 100644
+--- vcl/source/window/status.cxx
++++ vcl/source/window/status.cxx
+@@ -156,6 +156,7 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle )
+     mbProgressMode	= FALSE;
+     mbInUserDraw	= FALSE;
+     mbBottomBorder	= FALSE;
++    mnItemsWidth    = STATUSBAR_OFFSET_X;
+     mnDX			= 0;
+     mnDY			= 0;
+     mnCalcHeight	= 0;