# HG changeset patch
# User coleenp
# Date 1379720729 -7200
# Node ID df03413ad1a9ed8c9a269aa95b3ef40efe94463a
# Parent  e5a25e4ae50972648dbeed2f99bcc1ce34d38160# Parent  7c29904fdfa2902f30478e34e802d99df2f492fb
Merge

diff -r 7c29904fdfa2 -r df03413ad1a9 src/share/vm/services/diagnosticArgument.cpp
--- a/src/share/vm/services/diagnosticArgument.cpp	Fri Sep 20 18:34:00 2013 -0400
+++ b/src/share/vm/services/diagnosticArgument.cpp	Sat Sep 21 01:45:29 2013 +0200
@@ -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) {