sal/rtl/strtmpl.hxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 6028e9fda96d0ed5da266b1c54a7755f7ba3408c
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Feb 1 09:24:01 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Feb 1 09:51:15 2023 +0000

    Finally drop undocumented rtl_[u]String_newFromStr null argument support
    
    ...executing on the TODO left by 4f0c70fb5554325e0cc2129741175bf07de22029 
"Avoid
    calling OString ctor with null pointer" in late 2020.
    
    Change-Id: I3db6e2df61ca290948affc5e02ae74757441471d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146428
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index eb9371219178..a814f4998a43 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -982,16 +982,7 @@ template <typename IMPL_RTL_STRINGDATA>
 void newFromStr                                ( IMPL_RTL_STRINGDATA** ppThis,
                                                  const 
STRCODE<IMPL_RTL_STRINGDATA>* pCharStr )
 {
-#if OSL_DEBUG_LEVEL > 0
-    //TODO: For now, only abort in non-production debug builds; once all 
places that rely on the
-    // undocumented newFromStr behavior of treating a null pCharStr like an 
empty string have been
-    // found and fixed, drop support for that behavior and turn this into a 
general assert:
-    if (pCharStr == nullptr) {
-        std::abort();
-    }
-#endif
-
-    newFromStr_WithLength(ppThis, pCharStr, pCharStr ? getLength(pCharStr) : 
0);
+    newFromStr_WithLength(ppThis, pCharStr, getLength(pCharStr));
 }
 
 /* ----------------------------------------------------------------------- */

Reply via email to