1 files changed, 10 insertions, 1 deletions

diff --git a/linden/indra/test/llsd_new_tut.cpp b/linden/indra/test/llsd_new_tut.cpp
index 6c8d96a..8a24dab 100644
--- a/linden/indra/test/llsd_new_tut.cpp
+++ b/linden/indra/test/llsd_new_tut.cpp
@@ -108,7 +108,7 @@ namespace tut
                 SDCleanupCheck check;
                 
                 LLSD v;
-                
+
                 v = true;               ensureTypeAndValue("set true", v, true);
                 v = false;              ensureTypeAndValue("set false", v, false);
                 v = true;               ensureTypeAndValue("set true again", v, true);
@@ -749,6 +749,15 @@ namespace tut
                 }
         }
 
+        template<> template<>
+        void SDTestObject::test<14>()
+                // make sure that assignment of char* NULL in a string does not crash.
+        {
+                LLSD v;
+                v = (const char*)NULL;
+                ensure("type is a string", v.isString());
+        }
+
         /* TO DO:
                 conversion of undefined to UUID, Date, URI and Binary
                 conversion of undefined to map and array