[Libreoffice-commits] core.git: sal/rtl

Stephan Bergmann sbergman at redhat.com
Fri Feb 6 01:23:24 PST 2015


 sal/rtl/strbuf.cxx  |    1 -
 sal/rtl/ustrbuf.cxx |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 2c03d6fb053319e61ed600a3c22c4fd39da84e4d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 6 10:18:37 2015 +0100

    Remove bogus asserts
    
    ...regression introduced with b0ef5cf258f3a84054c052f0a09a208dbc17fdf3 "sal: add
    some argument checking assertions for strings and buffers" not being aware of
    186990395d72a803dd4a9f087fe4e05f49e69ad2 "Clean up Mac _imp_getProcessLocale:
    Introduces OUStringBuffer::appendUninitialized."
    
    Change-Id: I828d98eb52f57f4e39e71ded39ef034e1788f4d1

diff --git a/sal/rtl/strbuf.cxx b/sal/rtl/strbuf.cxx
index bb42dee..b88b0d9 100644
--- a/sal/rtl/strbuf.cxx
+++ b/sal/rtl/strbuf.cxx
@@ -105,7 +105,6 @@ void SAL_CALL rtl_stringbuffer_insert( rtl_String ** This,
     assert(This);
     assert(capacity && *capacity >= 0);
     assert(offset >= 0 && offset <= (**This).length);
-    assert(len == 0 || str != nullptr);
     assert(len >= 0);
     sal_Int32 nOldLen;
     sal_Char * pBuf;
diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx
index 2755ca6..7f5d698 100644
--- a/sal/rtl/ustrbuf.cxx
+++ b/sal/rtl/ustrbuf.cxx
@@ -129,7 +129,6 @@ void SAL_CALL rtl_uStringbuffer_insert( rtl_uString ** This,
     assert(This);
     assert(capacity && *capacity >= 0);
     assert(offset >= 0 && offset <= (**This).length);
-    assert(len == 0 || str != nullptr);
     assert(len >= 0);
     sal_Int32 nOldLen;
     sal_Unicode * pBuf;


More information about the Libreoffice-commits mailing list