# HG changeset patch
# User mgerdin
# Date 1379698481 25200
# Node ID c7856a83bcda03168d0cac27f9d4af03a33cfbb4
# Parent  d2865d1d79e69f697bd469c5f2aaac10eb5a9224# Parent  cf6e850c26db2a872c2cb165992190ff2f71e018
Merge

diff -r d2865d1d79e6 -r c7856a83bcda hotspot/src/share/vm/services/diagnosticArgument.cpp
--- a/hotspot/src/share/vm/services/diagnosticArgument.cpp	Fri Sep 20 09:44:04 2013 -0400
+++ b/hotspot/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) {