[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Eike Rathke]

 sc/source/ui/docshell/docsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 100a21046a95a868f32b90dab48de1cd5781fcd9
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Aug 27 00:30:01 2014 +0200

    out-of-bounds string access, this comparison never matched
    
    aName == aLinkTabName.copy(nIndex, nLinkTabNameLength)
    is not a replacement for
    String(aName).Equals(String(aLinkTabName), nIndex, nLinkTabNameLength)
    instead use
    aName.match( aLinkTabName, nIndex)
    because here nLinkTabNameLength actually is aLinkTabName.getLength()
    
    Change-Id: I884f56541f819db5672e9d096a26a3673e82d83b
    (cherry picked from commit aebcabd54cc5587f3856c48db0a4c4fc0f3f8ce8)
    Reviewed-on: https://gerrit.libreoffice.org/11134
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index bfc94db..71dfa0a 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -326,7 +326,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
                             {
                                 xub_StrLen nIndex = nNameLength - nLinkTabNameLength;
                                 INetURLObject aINetURLObject(aDocURLBuffer.makeStringAndClear());
-                                if(aName == aLinkTabName.copy(nIndex, nLinkTabNameLength) &&
+                                if(aName.match( aLinkTabName, nIndex) &&
                                     (aName[nIndex - 1] == '#') && // before the table name should be the # char
                                     !aINetURLObject.HasError()) // the docname should be a valid URL
                                 {