Merge pull request #294 from jolavillette/FixDirectoryStorageMemLeak

csoler · web-flow · commit 804704304e71 · 2026-05-15T10:18:34.000+02:00
fix: add missing destructor in DirectoryStorage to free mFileHierarchy
diff --git a/src/file_sharing/directory_storage.cc b/src/file_sharing/directory_storage.cc
@@ -100,6 +100,11 @@ DirectoryStorage::DirectoryStorage(const RsPeerId &pid,const std::string& fname)
     load(fname) ;
 }
 
+DirectoryStorage::~DirectoryStorage()
+{
+	delete mFileHierarchy;
+}
+
 DirectoryStorage::EntryIndex DirectoryStorage::root() const
 {
     return EntryIndex(0) ;
diff --git a/src/file_sharing/directory_storage.h b/src/file_sharing/directory_storage.h
@@ -39,7 +39,7 @@ class DirectoryStorage
 {
 	public:
         DirectoryStorage(const RsPeerId& pid, const std::string& fname) ;
-        virtual ~DirectoryStorage() {}
+        virtual ~DirectoryStorage();
 
         typedef uint32_t EntryIndex ;
         static const EntryIndex NO_INDEX = 0xffffffff;

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,11 @@ DirectoryStorage::DirectoryStorage(const RsPeerId &pid,const std::string& fname)`
`100`	`100`	`load(fname) ;`
`101`	`101`	`}`
`102`	`102`
	`103`	`+DirectoryStorage::~DirectoryStorage()`
	`104`	`+{`
	`105`	`+ delete mFileHierarchy;`
	`106`	`+}`
	`107`	`+`
`103`	`108`	`DirectoryStorage::EntryIndex DirectoryStorage::root() const`
`104`	`109`	`{`
`105`	`110`	`return EntryIndex(0) ;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class DirectoryStorage`
`39`	`39`	`{`
`40`	`40`	`public:`
`41`	`41`	`DirectoryStorage(const RsPeerId& pid, const std::string& fname) ;`
`42`		`- virtual ~DirectoryStorage() {}`
	`42`	`+ virtual ~DirectoryStorage();`
`43`	`43`
`44`	`44`	`typedef uint32_t EntryIndex ;`
`45`	`45`	`static const EntryIndex NO_INDEX = 0xffffffff;`