[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sal/rtl

Stephan Bergmann sbergman at redhat.com
Fri Oct 11 09:36:30 PDT 2013


 sal/rtl/source/strtmpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5688ab5ba457ea9a50152570d161a11a1d093994
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 9 19:10:32 2013 +0200

    Fail fast at least in debug builds
    
    (cherry picked from commit 57a28dc9556b4e6fff337e0eb9d0d8abc5223161)
    Conflicts:
    	sal/rtl/strtmpl.cxx
    
    Change-Id: I266d5cf5b98827617f7ed65c94a772e28808f386
    Reviewed-on: https://gerrit.libreoffice.org/6189
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index f9d7a5e..b303e10 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -1198,7 +1198,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromSubString )( IMPL_RTL_STRINGDATA** ppT
     }
     if ( count < 0 || beginIndex < 0 || beginIndex + count > pFrom->length )
     {
-        OSL_FAIL( "Out of bounds substring access" );
+        assert(false);
         IMPL_RTL_STRINGNAME( newFromLiteral )( ppThis, "!!br0ken!!", 10, 0 );
         return;
     }


More information about the Libreoffice-commits mailing list