OpenJDK / portola / portola
changeset 20062:c7856a83bcda
Merge
| author | mgerdin |
|---|---|
| date | Fri, 20 Sep 2013 10:34:41 -0700 |
| parents | d2865d1d79e6 cf6e850c26db |
| children | 1bf86af2cec9 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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) {