diff options
author | Aron Budea <aron.budea@collabora.com> | 2021-02-15 21:46:45 +0100 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2021-02-21 22:33:34 +0100 |
commit | 70f778657d90fa974281233628e1006740d4d698 (patch) | |
tree | 43fe64ad965ac09b7b807e808d0d4d120b81c478 | |
parent | [cp-6.2 only] Fix SfxViewShell::SetLOKLanguageTag, as in cp-6.4 and higher (diff) | |
download | core-70f778657d90fa974281233628e1006740d4d698.tar.gz core-70f778657d90fa974281233628e1006740d4d698.zip |
Avoid crash in online on a document with comments
Crashed on a specific doc with the following backtrace:
Thread 1 "kitbroker_001" received signal SIGSEGV, Segmentation fault.
0x00007f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField
(this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
71 const SwPostItField* GetPostItField() const { return mpField; }
0 0x00007f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField()
const (this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
1 0x00007f4807f0641b in SwXTextDocument::getPostIts(tools::JsonWriter&)
(this=0x557e1d985a10, rJsonWriter=...)
at /.../libreoffice/sw/source/uibase/uno/unotxdoc.cxx:3337
2 0x00007f4823216534 in getPostIts(LibreOfficeKitDocument*)
(pThis=0x557e1d93c890)
at /.../libreoffice/desktop/source/lib/init.cxx:3425
...
Change-Id: Ib97fd33fda936cad0c9ed3a29564fc0a49ff20c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110917
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 934ed8d888abe231c014ce179e5256933b0562ed)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111179
Reviewed-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 3ab7e4a8c8d8..1a746f65f7d1 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3368,6 +3368,11 @@ OUString SwXTextDocument::getPostIts() { sw::annotation::SwAnnotationWin* pWin = sidebarItem->pPostIt.get(); + if (!pWin) + { + continue; + } + const SwPostItField* pField = pWin->GetPostItField(); const SwRect& aRect = pWin->GetAnchorRect(); tools::Rectangle aSVRect(aRect.Pos().getX(), |