diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-10-05 19:53:37 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-10-05 19:53:37 +0000 |
| commit | 1a322b695511b651935415ca01adaa3461436f8d (patch) | |
| tree | fdfb29c0a26178c3a51307b7f1c86fd67aaf15af /epan/dissectors/packet-ssl-utils.c | |
| parent | 23c4983424108af59ee975bb9b94ed710b6677ab (diff) | |
| download | wireshark-1a322b695511b651935415ca01adaa3461436f8d.tar.gz | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5277 :
Don't pass a NULL pointer to a string to ssl_debug_printf() (which eventually
calls vfprintf()): Solaris doesn't like it when you do that.
svn path=/trunk/; revision=34386
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index d121738d4e..9737435cfa 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3197,7 +3197,7 @@ ssl_parse_key_list(const gchar * keys_list, GHashTable *key_hash, GTree* associa service->port = atoi(port); } ssl_debug_printf("ssl_init addr '%u.%u.%u.%u' port '%d' filename '%s' password(only for p12 file) '%s'\n", - ip[0], ip[1], ip[2], ip[3], service->port, filename, cert_passwd); + ip[0], ip[1], ip[2], ip[3], service->port, filename, cert_passwd ? cert_passwd : "(null)"); /* try to load pen or p12 file*/ fp = ws_fopen(filename, "rb"); |