From cc21f1ab22328ddf2bd82a77d81dbee69c847e5e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 19 Oct 2018 14:11:56 +0100 Subject: dubious SysAllocString check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1aece8321b12351b5e8a2d5c33e513531cbc95a1 Reviewed-on: https://gerrit.libreoffice.org/62007 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- winaccessibility/source/UAccCOM/AccTable.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index dcd4ad2d65d7..6a872b277dc0 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -132,9 +132,9 @@ STDMETHODIMP CAccTable::get_columnDescription(long column, BSTR * description) const ::rtl::OUString& ouStr = GetXInterface()->getAccessibleColumnDescription(column); // #CHECK# - SAFE_SYSFREESTRING(*description);//?? + SAFE_SYSFREESTRING(*description); *description = SysAllocString(o3tl::toW(ouStr.getStr())); - if(description==nullptr) + if (*description==nullptr) return E_FAIL; return S_OK; @@ -353,9 +353,8 @@ STDMETHODIMP CAccTable::get_rowDescription(long row, BSTR * description) SAFE_SYSFREESTRING(*description); *description = SysAllocString(o3tl::toW(ouStr.getStr())); - if(description==nullptr) + if (*description==nullptr) return E_FAIL; - return S_OK; LEAVE_PROTECTED_BLOCK -- cgit v1.2.3