mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #11361: rct_object_filters leak in EditorObjectSelection.cpp (#11364)

This commit is contained in:
Tulio Leao 2020-04-19 16:28:01 -03:00 committed by GitHub
parent cee24312d6
commit 4d679b7e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -260,7 +260,7 @@ struct list_item
{ {
const ObjectRepositoryItem* repositoryItem; const ObjectRepositoryItem* repositoryItem;
rct_object_entry* entry; rct_object_entry* entry;
rct_object_filters* filter; std::unique_ptr<rct_object_filters> filter;
uint8_t* flags; uint8_t* flags;
}; };
@ -310,7 +310,7 @@ static void visible_list_refresh(rct_window* w)
if (objectType == get_selected_object_type(w) && !(selectionFlags & OBJECT_SELECTION_FLAG_6) && filter_source(item) if (objectType == get_selected_object_type(w) && !(selectionFlags & OBJECT_SELECTION_FLAG_6) && filter_source(item)
&& filter_string(item) && filter_chunks(item) && filter_selected(selectionFlags)) && filter_string(item) && filter_chunks(item) && filter_selected(selectionFlags))
{ {
rct_object_filters* filter = new rct_object_filters; auto filter = std::make_unique<rct_object_filters>();
filter->ride.category[0] = 0; filter->ride.category[0] = 0;
filter->ride.category[1] = 0; filter->ride.category[1] = 0;
filter->ride.ride_type = 0; filter->ride.ride_type = 0;
@ -318,7 +318,7 @@ static void visible_list_refresh(rct_window* w)
list_item currentListItem; list_item currentListItem;
currentListItem.repositoryItem = item; currentListItem.repositoryItem = item;
currentListItem.entry = const_cast<rct_object_entry*>(&item->ObjectEntry); currentListItem.entry = const_cast<rct_object_entry*>(&item->ObjectEntry);
currentListItem.filter = filter; currentListItem.filter = std::move(filter);
currentListItem.flags = &_objectSelectionFlags[i]; currentListItem.flags = &_objectSelectionFlags[i];
_listItems.push_back(std::move(currentListItem)); _listItems.push_back(std::move(currentListItem));
} }