core.git: Branch 'distro/collabora/co-24.04' - sc/source

[Miklos Vajna (via logerrit)]

 sc/source/core/data/column3.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 1f9f5e67a436d3bf2add9c28b09e34743dcac552
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Apr 24 09:37:35 2024 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Apr 24 10:37:25 2024 +0200

    sc: fix crash in ScColumn::SetEditText()
    
    Crashreport:
    
    > SIG   Fatal signal received: SIGSEGV code: 128 for address: 0x0
    > program/libsclo.so
    >       ScColumn::SetEditText(int, std::unique_ptr<EditTextObject, 
std::default_delete<EditTextObject> >)
    >               sc/source/core/data/column3.cxx:2362
    > program/libsclo.so
    >       ScTable::SetEditText(short, int, std::unique_ptr<EditTextObject, 
std::default_delete<EditTextObject> >)
    >               
/opt/rh/devtoolset-12/root/usr/include/c++/12/bits/unique_ptr.h:395
    > program/libsclo.so
    >       ScDocument::SetEditText(ScAddress const&, 
std::unique_ptr<EditTextObject, std::default_delete<EditTextObject> >)
    >               
/opt/rh/devtoolset-12/root/usr/include/c++/12/bits/unique_ptr.h:395
    > program/libsclo.so
    >       ScDocFunc::SetEditCell(ScAddress const&, EditTextObject const&, 
bool)
    >               
/opt/rh/devtoolset-12/root/usr/include/c++/12/bits/unique_ptr.h:395
    > program/libsclo.so
    >       (anonymous 
namespace)::finalizeFormulaProcessing(std::shared_ptr<(anonymous 
namespace)::FormulaProcessingContext>)
    >               sc/source/ui/view/viewfunc.cxx:565
    
    Change-Id: I331ca8784702fdcb0ebad6a0a73390dbe2615ece
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166577
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 911e59ac7613..fdb8f050b196 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2359,6 +2359,11 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const 
OUString& rString,
 
 void ScColumn::SetEditText( SCROW nRow, std::unique_ptr<EditTextObject> 
pEditText )
 {
+    if (!pEditText)
+    {
+        return;
+    }
+
     pEditText->NormalizeString(GetDoc().GetSharedStringPool());
     std::vector<SCROW> aNewSharedRows;
     sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, 
false);