# HG changeset patch
# User mgerdin
# Date 1379698481 25200
# Node ID e5a25e4ae50972648dbeed2f99bcc1ce34d38160
# Parent  f201713502e044c4a4606323d07fba9c64319fc9# Parent  1b03bed31241e6796ea42991a37006dae2184e94
Merge

diff -r f201713502e0 -r e5a25e4ae509 src/share/vm/services/diagnosticArgument.cpp
--- a/src/share/vm/services/diagnosticArgument.cpp	Fri Sep 20 09:44:04 2013 -0400
+++ b/src/share/vm/services/diagnosticArgument.cpp	Fri Sep 20 10:34:41 2013 -0700
@@ -61,7 +61,7 @@
 }
 
 void GenDCmdArgument::to_string(char* c, char* buf, size_t len) {
-  jio_snprintf(buf, len, "%s", c);
+  jio_snprintf(buf, len, "%s", (c != NULL) ? c : "");
 }
 
 void GenDCmdArgument::to_string(StringArrayArgument* f, char* buf, size_t len) {