From 99a426d47df5b34570eae5128dbc7744f18540c0 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 30 Jun 2016 07:50:14 +0100
Subject: [PATCH] Added better handling of nulls

---
 src/osgPlugins/txp/trpage_material.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/osgPlugins/txp/trpage_material.cpp b/src/osgPlugins/txp/trpage_material.cpp
index 5828c6b32..ad2a2d7ed 100644
--- 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;
 }