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

[Caolán McNamara]

 ucb/source/ucp/webdav-neon/NeonSession.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 18a42a209ca50f046e5c0b63ec95403f81afce1d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 19 16:58:50 2015 +0100

    fix assert on loading kde98819-1.html
    
    Change-Id: I3f8ccf2d0642657b3768a237c96f15cf7a7aff97
    (cherry picked from commit 1cc396069b7170c12716dbfbbab149701dd2b540)
    (cherry picked from commit fb0cc37991a13e81490363f187bf9adfdeb5781b)
    Reviewed-on: https://gerrit.libreoffice.org/16376
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 2b8fc5d..5d95ac4 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -349,7 +349,9 @@ namespace {
         {
             nContStart += sPartId.getLength();
             sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart );
-            sPart = _rRawString.copy( nContStart, nContEnd - nContStart );
+            sPart = nContEnd != -1 ?
+                _rRawString.copy(nContStart, nContEnd - nContStart) :
+                _rRawString.copy(nContStart);
         }
         return sPart;
     }