[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - svl/source

[Michael Stahl (via logerrit)]

 svl/source/misc/sharedstringpool.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27ff58ddd6e48d9247f8befb16d1ca8ddddcb750
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Sun May 22 12:26:48 2022 +0200
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 24 09:57:04 2022 +0200

    svl: spurious GCC12 -Werror=maybe-uninitialized
    
    In file included from svl/source/misc/sharedstringpool.cxx:11:
    In constructor ‘svl::SharedString::SharedString(rtl_uString*, 
rtl_uString*)’,
        inlined from ‘svl::SharedString svl::SharedStringPool::intern(const 
rtl::OUString&)’ at svl/source/misc/sharedstringpool.cxx:129:51:
    include/svl/sharedstring.hxx:56:20: error: ‘pResultUpper’ may be used 
uninitialized [-Werror=maybe-uninitialized]
       56 |     mpData(pData), mpDataIgnoreCase(pDataIgnoreCase)
          |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    svl/source/misc/sharedstringpool.cxx: In member function ‘svl::SharedString 
svl::SharedStringPool::intern(const rtl::OUString&)’:
    svl/source/misc/sharedstringpool.cxx:93:33: note: ‘pResultUpper’ was 
declared here
       93 |     rtl_uString *pResultLower, *pResultUpper;
          |                                 ^~~~~~~~~~~~
    
    Change-Id: I2171855844c76ad3b2a72c1eca737691ca96fc46
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134736
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 694db7d3e7be0caf81dd52dba1a865db206ac145)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134629
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svl/source/misc/sharedstringpool.cxx 
b/svl/source/misc/sharedstringpool.cxx
index 7abe3ea77507..d88b0a2c22ef 100644
--- a/svl/source/misc/sharedstringpool.cxx
+++ b/svl/source/misc/sharedstringpool.cxx
@@ -92,7 +92,7 @@ SharedString SharedStringPool::intern(const OUString& rStr)
 {
     auto& rMap = mpImpl->maStrMap;
 
-    rtl_uString *pResultLower, *pResultUpper;
+    rtl_uString *pResultLower = {}, *pResultUpper = {}; // bogus GCC 12 
-Werror=maybe-uninitialized
     if (rMap.find_fn(rStr.pData, [&](const Mapped& rMapped) {
             pResultLower = rMapped.first.pData;
             pResultUpper = rMapped.second.pData;