[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sal/textenc svtools/source

[Caolán McNamara]

 sal/textenc/handleundefinedunicodetotextchar.cxx |    2 +-
 svtools/source/contnr/treelist.cxx               |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 15487c3f0fde61012ea69f88c64cdcd2017733b3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 31 21:11:57 2015 +0000

    coverity#1267678 this is surely backwards (gold)
    
    surely we clone from the source and return the newly created
    entry. Presumably this doesn't break all the time because
    aCloneLink is generally set ?
    
    coverity#1267678 Resource leak
    
    Change-Id: I3e02dfaef371e006f1510b186cdd881c991ef2cf
    (cherry picked from commit 9f1ecd3ac35f06746fe2a12ca52899f664679de5)
    Reviewed-on: https://gerrit.libreoffice.org/15023
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index cbd011a..2029931 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -355,8 +355,8 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* pSource ) const
     if( aCloneLink.IsSet() )
         return (SvTreeListEntry*)aCloneLink.Call( pSource );
     SvTreeListEntry* pEntry = CreateEntry();
-    pSource->Clone( pEntry );
-    return pSource;
+    pEntry->Clone(pSource);
+    return pEntry;
 }
 
 SvTreeListEntry* SvTreeList::CreateEntry() const
commit b1bede525c68e628456bf8cbe9ecc855d2307612
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 9 10:20:03 2014 +0100

    coverity#1209362 coverity gold, wrong mask
    
    Change-Id: I039563908a391103cc478e11666648cc517fc677

diff --git a/sal/textenc/handleundefinedunicodetotextchar.cxx b/sal/textenc/handleundefinedunicodetotextchar.cxx
index b92a9811..5a8ceef 100644
--- a/sal/textenc/handleundefinedunicodetotextchar.cxx
+++ b/sal/textenc/handleundefinedunicodetotextchar.cxx
@@ -58,7 +58,7 @@ bool ImplGetInvalidAsciiMultiByte(sal_uInt32 nFlags,
 {
     if (nMaxLen == 0)
         return false;
-    switch (nFlags & RTL_UNICODETOTEXT_FLAGS_UNDEFINED_MASK)
+    switch (nFlags & RTL_UNICODETOTEXT_FLAGS_INVALID_MASK)
     {
     case RTL_UNICODETOTEXT_FLAGS_INVALID_0:
         *pBuf = 0x00;