Changeset 11106

Timestamp:

Feb 3, 2016, 1:02:33 PM (9 years ago)

Author:

muemart

Message:

Fix a memory leak. Also fix some potentially invalid references to vector elements after the vector resized.

Location:

code/trunk/src/libraries/core/input

Files:

• KeyBinder.cc (modified) (4 diffs)
• KeyBinder.h (modified) (1 diff)

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -324 +324 @@
         Return the first key name for a specific command
     */
-    const std::string& KeyBinder::getBinding(const std::string& commandName)
+    std::string KeyBinder::getBinding(const std::string& commandName)
     {
         if (this->allCommands_.find(commandName) != this->allCommands_.end())
@@ -343 +343 @@
         The index at which the key name is returned for.
     */
-    const std::string& KeyBinder::getBinding(const std::string& commandName, unsigned int index)
+    std::string KeyBinder::getBinding(const std::string& commandName, unsigned int index)
     {
         if (this->allCommands_.find(commandName) != this->allCommands_.end())
@@ -361 +361 @@
         Return the first key name for a specific command in a human readable form
     */
-    const std::string& KeyBinder::getBindingReadable(const std::string& commandName)
-    {
-        const std::string& binding = this->getBinding(commandName);
+    std::string KeyBinder::getBindingReadable(const std::string& commandName)
+    {
+        std::string binding = this->getBinding(commandName);
 
         SubString substring = SubString(binding, ".");
@@ -394 +394 @@
             return binding;
 
-        return *(new std::string(stream.str()));
+        binding = stream.str();
+        return binding;
     }
 

code/trunk/src/libraries/core/input/KeyBinder.h

@@ -66 +66 @@
         void clearBindings();
         bool setBinding(const std::string& binding, const std::string& name, bool bTemporary = false);
-        const std::string& getBinding(const std::string& commandName); //tolua_export
-        const std::string& getBinding(const std::string& commandName, unsigned int index); //tolua_export
-        const std::string& getBindingReadable(const std::string& commandName); //tolua_export
+        std::string getBinding(const std::string& commandName); //tolua_export
+        std::string getBinding(const std::string& commandName, unsigned int index); //tolua_export
+        std::string getBindingReadable(const std::string& commandName); //tolua_export
         unsigned int getNumberOfBindings(const std::string& commandName); //tolua_export