From 356da1750d2be235c1b3055bffee604fa49fa90f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 21 Feb 2014 00:51:30 +0000 Subject: [PATCH] Correct wxDataViewColumn::AppendXXXColumn() return value in case of failure. Don't return invalid column pointer if it was freed because actually appending it to the control failed. Fixes corresponding Coverity warnings. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/datavcmn.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 9d68261fe0..0e62615e43 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -1927,9 +1927,7 @@ wxDataViewColumn *wxDataViewListCtrl::AppendToggleColumn( const wxString &label, new wxDataViewToggleRenderer( wxT("bool"), mode ), GetStore()->GetColumnCount()-1, width, align, flags ); - wxDataViewCtrl::AppendColumn( ret ); - - return ret; + return wxDataViewCtrl::AppendColumn( ret ) ? ret : NULL; } wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &label, @@ -1941,9 +1939,7 @@ wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &labe new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), GetStore()->GetColumnCount()-1, width, align, flags ); - wxDataViewCtrl::AppendColumn( ret ); - - return ret; + return wxDataViewCtrl::AppendColumn( ret ) ? ret : NULL; } wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &label, @@ -1955,9 +1951,7 @@ wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &labe new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), GetStore()->GetColumnCount()-1, width, align, flags ); - wxDataViewCtrl::AppendColumn( ret ); - - return ret; + return wxDataViewCtrl::AppendColumn( ret ) ? ret : NULL; } void wxDataViewListCtrl::OnSize( wxSizeEvent &event )