fix potential null pointer dereference for unnamed function arguments

2011-02-26 18:34:17 -05:00 · 2011-02-26 18:34:17 -05:00 · b74ebbda02
parent 31a18b9b23
commit b74ebbda02
1 changed files with 12 additions and 2 deletions
--- a/lib/symboldatabase.h
+++ b/lib/symboldatabase.h
@ -125,7 +125,13 @@ public:
     */
    const std::string &name() const
    {
+        static const std::string noname;
+
+        // name may not exist for function arguments
+        if (_name)
            return _name->str();
+
+        return noname;
    }

    /**
@ -134,7 +140,11 @@ public:
     */
    unsigned int varId() const
    {
+        // name may not exist for function arguments
+        if (_name)
            return _name->varId();
+
+        return 0;
    }

    /**