From: morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 22 Apr 2011 18:32:56 +0000 (+0000)
Subject: Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=123c449700c81c0b45b6cfc27400c9a942f59fbb

Avoid passing a NULL string pointer to format routines: some libc's (e.g.,
Solaris') will seg-fault on that.


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

diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 40c272e4b1..d1085758b8 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -1643,7 +1643,7 @@ dissect_rpc_continuation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  *  and version values.
  */
 
-static void 
+static void
 make_fake_rpc_prog_if_needed (rpc_prog_info_key *prpc_prog_key, guint prog_ver)
 {
 	/* sanity check: no one uses versions > 10 */
@@ -2245,6 +2245,10 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 			procname = (char *)match_strval(gss_proc, rpc_authgssapi_proc);
 		}
 
+		/* Don't pass NULL string pointers to the format routines below */
+		if (!procname)
+			procname = "(null)";
+
 		rpc_prog_key.prog = prog;
 		if ((rpc_prog = g_hash_table_lookup(rpc_progs,&rpc_prog_key)) == NULL) {
 			proto = NULL;