Added better handling of nulls

2016-06-30 07:50:14 +01:00
parent fa14b5263e
commit 99a426d47d
1 changed files with 11 additions and 2 deletions
--- a/src/osgPlugins/txp/trpage_material.cpp
+++ b/src/osgPlugins/txp/trpage_material.cpp
@@ -1106,9 +1106,18 @@ bool trpgTexture::GetName(char *outName,int outLen) const
    if (!isValid())
        return false;

-    int len = (name) ? strlen(name) : 0;
-    strncpy(outName,name,MIN(len,outLen)+1);
+    if (!outName)
+        return false;

+    if (name)
+    {
+        int len = strlen(name);
+        strncpy(outName,name,MIN(len,outLen)+1);
+    }
+    else
+    {
+        outName[0] = '\0';
+    }
    return true;
 }