Mercurial > hg > icedtea8-forest > hotspot
changeset 9386:1ccd27199595 jdk8u112-b09
Merge
author | asaha |
---|---|
date | Tue, 16 Aug 2016 12:48:43 -0700 |
parents | d18eb5b5a3d6 (current diff) 96973081eb8a (diff) |
children | 14919ca8db45 |
files | .hgtags src/share/vm/prims/jvm.cpp |
diffstat | 4 files changed, 31 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Aug 05 10:47:35 2016 +0000 +++ b/.hgtags Tue Aug 16 12:48:43 2016 -0700 @@ -904,6 +904,7 @@ 019b22dd8128840ecdcd1bfebcf4447e28e45068 jdk8u111-b06 3f337aaf090769653ee0a746fbe661d09055a883 jdk8u111-b07 e180e364a40364a059a20c74b97ab4e928e2b676 jdk8u111-b08 +c48b303692bb86c42e928da6dec815e901a24c5b jdk8u111-b09 b09a69142dd3bf78ca66bb0c99046ca7cccbdda9 jdk8u112-b00 cf1faa9100dd8c8df6e1a604aaf613d037f51ebf jdk8u112-b01 f22b5be95347c669a1463d9e05ec3bf11420208e jdk8u112-b02
--- a/src/share/vm/prims/jvm.cpp Fri Aug 05 10:47:35 2016 +0000 +++ b/src/share/vm/prims/jvm.cpp Tue Aug 16 12:48:43 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2872,7 +2872,18 @@ int jio_vsnprintf(char *str, size_t count, const char *fmt, va_list args) { // see bug 4399518, 4417214 if ((intptr_t)count <= 0) return -1; - return vsnprintf(str, count, fmt, args); + + int result = vsnprintf(str, count, fmt, args); + // Note: on truncation vsnprintf(3) on Unix returns number of + // characters which would have been written had the buffer been large + // enough; on Windows, it returns -1. We handle both cases here and + // always return -1, and perform null termination. + if ((result > 0 && (size_t)result >= count) || result == -1) { + str[count - 1] = '\0'; + result = -1; + } + + return result; } ATTRIBUTE_PRINTF(3, 0)
--- a/src/share/vm/runtime/deoptimization.cpp Fri Aug 05 10:47:35 2016 +0000 +++ b/src/share/vm/runtime/deoptimization.cpp Tue Aug 16 12:48:43 2016 -0700 @@ -1881,8 +1881,6 @@ trap_reason_name(reason), recomp_flag ? " recompiled" : ""); } - if (len >= buflen) - buf[buflen-1] = '\0'; return buf; } @@ -1952,8 +1950,6 @@ len = jio_snprintf(buf, buflen, "reason='%s' action='%s' index='%d'", reason, action, unloaded_class_index); } - if (len >= buflen) - buf[buflen-1] = '\0'; return buf; }
--- a/src/share/vm/runtime/java.cpp Fri Aug 05 10:47:35 2016 +0000 +++ b/src/share/vm/runtime/java.cpp Tue Aug 16 12:48:43 2016 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -773,25 +773,36 @@ } void JDK_Version::to_string(char* buffer, size_t buflen) const { + assert(buffer && buflen > 0, "call with useful buffer"); size_t index = 0; if (!is_valid()) { jio_snprintf(buffer, buflen, "%s", "(uninitialized)"); } else if (is_partially_initialized()) { jio_snprintf(buffer, buflen, "%s", "(uninitialized) pre-1.6.0"); } else { - index += jio_snprintf( + int rc = jio_snprintf( &buffer[index], buflen - index, "%d.%d", _major, _minor); + if (rc == -1) return; + index += rc; if (_micro > 0) { - index += jio_snprintf(&buffer[index], buflen - index, ".%d", _micro); + rc = jio_snprintf(&buffer[index], buflen - index, ".%d", _micro); + if (rc == -1) return; + index += rc; } if (_update > 0) { - index += jio_snprintf(&buffer[index], buflen - index, "_%02d", _update); + rc = jio_snprintf(&buffer[index], buflen - index, "_%02d", _update); + if (rc == -1) return; + index += rc; } if (_special > 0) { - index += jio_snprintf(&buffer[index], buflen - index, "%c", _special); + rc = jio_snprintf(&buffer[index], buflen - index, "%c", _special); + if (rc == -1) return; + index += rc; } if (_build > 0) { - index += jio_snprintf(&buffer[index], buflen - index, "-b%02d", _build); + rc = jio_snprintf(&buffer[index], buflen - index, "-b%02d", _build); + if (rc == -1) return; + index += rc; } } }