[Libreoffice-commits] core.git: 3 commits - icu/icu4c.9948.mlym-crash.patch icu/UnpackedTarball_icu.mk sot/source svl/source

[Caolán McNamara]

 icu/UnpackedTarball_icu.mk      |    1 +
 icu/icu4c.9948.mlym-crash.patch |   11 +++++++++++
 sot/source/sdstor/stgelem.cxx   |    5 +++--
 svl/source/numbers/zformat.cxx  |    4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit eea3634b2bd85e7f290e0504da1b8906c7d33ca4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 19 16:18:16 2013 +0000

    Resolves: fdo#52519 crash on typing some Malayalam
    
    Change-Id: Ie31da5896d98908fd540146d1105ecc4257fa071

diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index 4b35dd9..329c1af 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_post_action,icu,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,icu,\
+	icu/icu4c.9948.mlym-crash.patch \
 	icu/icu4c-bsd.patch \
 	icu/icu4c-build.patch \
 	icu/icu4c.8198.revert.icu5431.patch \
diff --git a/icu/icu4c.9948.mlym-crash.patch b/icu/icu4c.9948.mlym-crash.patch
new file mode 100644
index 0000000..2a5d89c
--- /dev/null
+++ b/icu/icu4c.9948.mlym-crash.patch
@@ -0,0 +1,11 @@
+--- misc/build/icu/source/layout/IndicClassTables.cpp	2013-02-19 16:04:09.919412782 +0000
++++ misc/icu/source/layout/IndicClassTables.cpp	2013-02-19 16:04:14.519351601 +0000
+@@ -273,7 +273,7 @@
+ 
+ static const IndicClassTable kndaClassTable = {0x0C80, 0x0CEF, 4, KNDA_SCRIPT_FLAGS, kndaCharClasses, kndaSplitTable};
+ 
+-static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 3, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
++static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 4, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable};
+ 
+ static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 4, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable};
+ 
commit 0db079cd5a09b3f24b0dd3563f100c77561ccfde
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 18 09:41:28 2013 +0000

    coverity#982801 Out-of-bounds access
    
    surely given we stream this in on Load, we should stream
    it out on Store, rather than dump it out
    
    Change-Id: Ibf499dad8ebe6eb7a60cdbaf667d35eed8331685

diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 86e4fb8..48938f5 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -157,8 +157,9 @@ sal_Bool StgHeader::Store( StgIo& rIo )
         return sal_True;
     SvStream& r = *rIo.GetStrm();
     r.Seek( 0L );
-    r.Write( cSignature, 8 + 16 );
-    r << nVersion                   // 1A version number
+    r.Write( cSignature, 8 );
+    r << aClsId                     // 08 Class ID
+      << nVersion                   // 1A version number
       << nByteOrder                 // 1C Unicode byte order indicator
       << nPageSize                  // 1E 1 << nPageSize = block size
       << nDataPageSize              // 20 1 << this size == data block size
commit 5bdd1e9ee8f3ca9dc647998a8ec7b9415add01fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 18 08:20:04 2013 +0000

    related coverity#984042 move potentially uninitialized scalar variables
    
    Change-Id: I7cc181ca1cad1e8bce9cb44a7c2e2c7f534921e5

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 759136f..94fa2c0 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3629,7 +3629,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
     int nUseMonthCase = 0;      // not decided yet
     OUString aOrgCalendar;        // empty => not changed yet
 
-    double fOrgDateTime(0.);
+    double fOrgDateTime(0.0);
     bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] );
     if ( bOtherCalendar )
     {
@@ -3851,7 +3851,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
 
     int nUseMonthCase = 0;      // not decided yet
     OUString aOrgCalendar;        // empty => not changed yet
-    double fOrgDateTime;
+    double fOrgDateTime(0.0);
     bool bOtherCalendar = ImpIsOtherCalendar( NumFor[nIx] );
     if ( bOtherCalendar )
     {