[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-2' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/edit/vclmedit.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8a025d3f86bdc51013df27d8290ddf7cfcf1b36f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 10 14:18:52 2020 +0000
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Mar 11 16:47:24 2020 +0100

    Resolves: tdf#131248 a11y crash when closing SQL Edit Query
    
    Change-Id: I39db7b352dd460f46092a054bfa89f5acdda54c1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90273
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 156f14c6632df104186feeba250abdf7de4a2e30)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90280
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index e21d5c4c8f57..49b63e9ae3e9 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1087,6 +1087,9 @@ void VclMultiLineEdit::SetReadOnly( bool bReadOnly )
 
 bool VclMultiLineEdit::IsReadOnly() const
 {
+    if (!pImpVclMEdit)  // might be called from within the dtor, when pImpVclMEdit == NULL is a valid state
+        return true;
+
     return pImpVclMEdit->IsReadOnly();
 }