commit 12d6231045899534ce8ba5f7c273a1ae88f3804b
author Caolán McNamara <caolanm@redhat.com> Mon May 20 15:29:30 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Mon May 20 18:27:24 2019 +0200
tree d62355799bd51bb324de4b41b59641e6a7e76dff
parent 9d68325feabac4c3278d0ca45033163f7461e66a

Resolves: tdf#125392 null-deref

Change-Id: I7225c20148121b215ba09cf3ec1603f440ca2d7e
Reviewed-on: https://gerrit.libreoffice.org/72607
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/unx/gtk3/gtk3gtkinst.cxx

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 3e8429e..bfdfb05 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -6141,8 +6141,8 @@ namespace
        gtk_tree_sortable_get_sort_column_id(pSortable, &sort_column_id, nullptr);
        gtk_tree_model_get(pModel, a, sort_column_id, &pName1, -1);
        gtk_tree_model_get(pModel, b, sort_column_id, &pName2, -1);
        gint ret = pSorter->compare(OUString(pName1, strlen(pName1), RTL_TEXTENCODING_UTF8),
                                    OUString(pName2, strlen(pName2), RTL_TEXTENCODING_UTF8));
        gint ret = pSorter->compare(OUString(pName1, pName1 ? strlen(pName1) : 0, RTL_TEXTENCODING_UTF8),
                                    OUString(pName2, pName2 ? strlen(pName2) : 0, RTL_TEXTENCODING_UTF8));
        g_free(pName1);
        g_free(pName2);
        return ret;