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

[Michael Stahl]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7bd0484228beb4529e84742faf56f813dca495a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 18 22:07:02 2014 +0200

    (related: fdo#78502) writerfilter: RTF import: fix invalid string copy
    
    ... in leveltext destination.
    
    Change-Id: I74de6d14170130bf33923854a0c9851dc7cc390f
    (cherry picked from commit b94bd40b915ab32d18d43fc60dfda932e4e00ca8)
    Reviewed-on: https://gerrit.libreoffice.org/10397
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 66abe80..73eb3f2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4278,7 +4278,7 @@ int RTFDocumentImpl::popState()
                 // The first character is the length of the string (the rest should be ignored).
                 sal_Int32 nLength(aStr.toChar());
                 OUString aValue;
-                if (nLength <= aStr.getLength())
+        if (nLength < aStr.getLength())
                     aValue = aStr.copy(1, nLength);
                 else
                     aValue = aStr;