From 52c89a76b2ef10d5394752356b937f845ff46ac9 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Mon, 27 Apr 2020 03:56:12 -0700 Subject: [PATCH] kern: fix KLinkedList dtor --- .../include/mesosphere/kern_k_linked_list.hpp | 10 ++++++++++ .../include/vapours/svc/svc_types_common.hpp | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libraries/libmesosphere/include/mesosphere/kern_k_linked_list.hpp b/libraries/libmesosphere/include/mesosphere/kern_k_linked_list.hpp index 478008056..23f86fe66 100644 --- a/libraries/libmesosphere/include/mesosphere/kern_k_linked_list.hpp +++ b/libraries/libmesosphere/include/mesosphere/kern_k_linked_list.hpp @@ -122,6 +122,16 @@ namespace ams::kern { public: constexpr KLinkedList() : BaseList() { /* ... */ } + ~KLinkedList() { + /* Erase all elements. */ + for (auto it = this->begin(); it != this->end(); it = this->erase(it)) { + /* ... */ + } + + /* Ensure we succeeded. */ + MESOSPHERE_ASSERT(this->empty()); + } + /* Iterator accessors. */ iterator begin() { return iterator(BaseList::begin()); diff --git a/libraries/libvapours/include/vapours/svc/svc_types_common.hpp b/libraries/libvapours/include/vapours/svc/svc_types_common.hpp index 9ecb75018..4567e5d0b 100644 --- a/libraries/libvapours/include/vapours/svc/svc_types_common.hpp +++ b/libraries/libvapours/include/vapours/svc/svc_types_common.hpp @@ -192,10 +192,10 @@ namespace ams::svc { }; enum CodeMemoryOperation : u32 { - CodeMemoryOperation_MapOwner = 0, - CodeMemoryOperation_MapSlave = 1, - CodeMemoryOperation_UnmapOwner = 2, - CodeMemoryOperation_UnmapSlave = 3, + CodeMemoryOperation_Map = 0, + CodeMemoryOperation_MapToOwner = 1, + CodeMemoryOperation_Unmap = 2, + CodeMemoryOperation_UnmapFromOwner = 3, }; /* Synchronization types. */