--- a/src/hotspot/share/prims/jvm.cpp Tue Feb 13 15:48:23 2018 +0100
+++ b/src/hotspot/share/prims/jvm.cpp Tue Feb 27 18:17:57 2018 -0500
@@ -2670,23 +2670,19 @@
ATTRIBUTE_PRINTF(3, 0)
int jio_vsnprintf(char *str, size_t count, const char *fmt, va_list args) {
- // see bug 4399518, 4417214
+ // Reject count values that are negative signed values converted to
+ // unsigned; see bug 4399518, 4417214
if ((intptr_t)count <= 0) return -1;
- int result = vsnprintf(str, count, fmt, args);
- // Note: on truncation vsnprintf(3) on Unix returns numbers 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';
+ int result = os::vsnprintf(str, count, fmt, args);
+ if (result > 0 && (size_t)result >= count) {
result = -1;
}
return result;
}
-ATTRIBUTE_PRINTF(3, 0)
+ATTRIBUTE_PRINTF(3, 4)
int jio_snprintf(char *str, size_t count, const char *fmt, ...) {
va_list args;
int len;
@@ -2696,7 +2692,7 @@
return len;
}
-ATTRIBUTE_PRINTF(2,3)
+ATTRIBUTE_PRINTF(2, 3)
int jio_fprintf(FILE* f, const char *fmt, ...) {
int len;
va_list args;