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

[Caolán McNamara (via logerrit)]

 cui/source/customize/SvxNotebookbarConfigPage.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 60b9663864cd8350840196c24388c467fb170260
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jun 10 15:53:56 2020 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jun 12 21:32:04 2020 +0200

    Resolves: tdf#133862 crash in customize toolbar in embedded math
    
    Change-Id: I2fc7f3620145e48516c3ca73c0a5d08dce11d78a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96035
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit 88eb53673b711696fac8d2494a9cde46d29bc458)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96100
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx 
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index c8270b941385..198a19f57782 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -433,6 +433,8 @@ void SvxNotebookbarConfigPage::SelectElement()
     OString sUIFileUIPath = CustomNotebookbarGenerator::getSystemPath(
         CustomNotebookbarGenerator::getCustomizedUIPath());
     xmlDocPtr pDoc = xmlParseFile(sUIFileUIPath.getStr());
+    if (!pDoc)
+        return;
     xmlNodePtr pNodePtr = xmlDocGetRootElement(pDoc);
 
     std::vector<NotebookbarEntries> aEntries;
@@ -494,10 +496,7 @@ void SvxNotebookbarConfigPage::SelectElement()
 
     aEntries.clear();
 
-    if (pDoc != nullptr)
-    {
-        xmlFreeDoc(pDoc);
-    }
+    xmlFreeDoc(pDoc);
 }
 
 
SvxNotebookbarEntriesListBox::SvxNotebookbarEntriesListBox(std::unique_ptr<weld::TreeView>
 xParent,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits