Added null pointer handling

2016-06-29 17:29:28 +01:00
parent e3c48d9f45
commit 3c1d3b981c
1 changed files with 7 additions and 2 deletions
--- a/src/osgPlugins/txp/trpage_model.cpp
+++ b/src/osgPlugins/txp/trpage_model.cpp
@@ -218,9 +218,14 @@ bool trpgModel::GetType(int &t)
 }
 bool trpgModel::GetName(char *str,int strLen) const
 {
-    if (!isValid()) return false;
-    int len = (name ? strlen(name) : 0);
+    if (!isValid() || !name)
+    {
+        return false;
+    }
+
+    int len = strlen(name);
    strncpy(str,name,MIN(len,strLen)+1);
+
    return true;
 }
 bool trpgModel::GetNumTiles(int &ret) const