In proto_tree_set_string(), don't set a null fvalue or Ethereal will throw

a hissy fit.  Fixes bug 157.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14299 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/NEWS b/NEWS
index c1cda3f5c56c12464081c259cf0e9f24bfe31cbb..94e57f8adea17963695e2117912f866f62f90a19 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -150,6 +150,10 @@ up a multitude of security issues:
   The TCAP dissector could overflow a buffer or throw an assertion.
   Versions affected: 0.10.8 to 0.10.10
 
+  The NTLMSSP dissector could crash.
+  Versions affected: 0.9.7 to 0.10.10
+
+
   Additionally, a number of dissectors could throw an assertion when
   passing an invalid protocol tree item length.
   Versions affected: 0.10.8 to 0.10.10

diff --git a/epan/proto.c b/epan/proto.c
index a7639464938a5d68443c4b1db2e9e69e1bf64a41..9a8882a3e141a180f28898529861f14d9fffd27f 100644 (file)
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1496,7 +1496,10 @@ static void
 proto_tree_set_string(field_info *fi, const char* value,
                gboolean already_allocated)
 {
-       fvalue_set(&fi->value, (gpointer) value, already_allocated);
+       if (value)
+               fvalue_set(&fi->value, (gpointer) value, already_allocated);
+       else
+               fvalue_set(&fi->value, (gpointer) "[ Null ]", already_allocated);
 }
 
 static void