Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormgerdin
Fri, 20 Sep 2013 10:34:41 -0700
changeset 20062 c7856a83bcda
parent 20060 d2865d1d79e6 (current diff)
parent 20061 cf6e850c26db (diff)
child 20064 1bf86af2cec9
Merge
--- 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) {
jdk-sandbox