aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/service/service.h
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-01-07 16:55:44 -0200
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-01-07 17:32:31 -0200
commita6ad68190fb02af9c89dc461f451bb75c8a10a94 (patch)
treea1fd04b7356286f49d1624d81be53af5b9609145 /src/core/hle/service/service.h
parent317fe1e52880de91f19e7ee3cf89f8a9f9a17ad2 (diff)
Fix double-free in Service manager during shutdown
Fixes #423.
Diffstat (limited to 'src/core/hle/service/service.h')
-rw-r--r--src/core/hle/service/service.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 28b4ccd1..41ba1e55 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -114,29 +114,22 @@ private:
/// Simple class to manage accessing services from ports and UID handles
class Manager {
-
public:
- Manager();
-
- ~Manager();
-
- /// Add a service to the manager (does not create it though)
+ /// Add a service to the manager
void AddService(Interface* service);
- /// Removes a service from the manager (does not delete it though)
+ /// Removes a service from the manager
void DeleteService(const std::string& port_name);
- /// Get a Service Interface from its UID
- Interface* FetchFromHandle(u32 uid);
+ /// Get a Service Interface from its Handle
+ Interface* FetchFromHandle(Handle handle);
/// Get a Service Interface from its port
Interface* FetchFromPortName(const std::string& port_name);
private:
-
std::vector<Interface*> m_services;
std::map<std::string, u32> m_port_map;
-
};
/// Initialize ServiceManager