Merge branch 'fmorgner/develop/fix-shared-ptr-leaks' into 'develop'

Fix kstd::shared_ptr based leaks (and potential double-frees)

See merge request teachos/kernel!51

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/src/filesystem/dentry.cpp b/kernel/src/filesystem/dentry.cpp
index 3d8e01a..01de276 100644
--- a/kernel/src/filesystem/dentry.cpp
+++ b/kernel/src/filesystem/dentry.cpp
@@ -34,9 +34,9 @@ namespace kernel::filesystem
     return m_inode;
   }
 
-  auto dentry::parent() const -> kstd::shared_ptr<dentry> const &
+  auto dentry::parent() const -> kstd::shared_ptr<dentry>
   {
-    return m_parent;
+    return m_parent.lock();
   }
 
   auto dentry::name() const -> std::string_view
@@ -48,7 +48,7 @@ namespace kernel::filesystem
   {
     kstd::string path = m_name;
 
-    auto parent = m_parent;
+    auto parent = this->parent();
     while (parent)
     {
       auto parent_name = parent->m_name;
@@ -61,7 +61,7 @@ namespace kernel::filesystem
         path = parent_name + "/" + path;
       }
 
-      parent = parent->m_parent;
+      parent = parent->parent();
     }
 
     return path;