archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8076475: Misuses of strncpy/strncat

Browse source 
Various small fixes around strncpy and strncat

Reviewed-by: dsamersoff, coleenp
This commit is contained in:
Thomas Stuefe 2015-04-07 14:19:03 +02:00
parent 137a04308f
commit c034b74806
12 changed files with 56 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hotspot/src/share/vm/utilities/ostream.cpp
View file

@ -109,7 +109,7 @@ const char* outputStream::do_vsnprintf(char* buffer, size_t buflen,
}
if (add_cr) {
if (result != buffer) {
strncpy(buffer, result, buflen);
memcpy(buffer, result, result_len);
result = buffer;
}
buffer[result_len++] = '\n';
@ -334,15 +334,19 @@ void stringStream::write(const char* s, size_t len) {
assert(rm == NULL || Thread::current()->current_resource_mark() == rm,
"stringStream is re-allocated with a different ResourceMark");
buffer = NEW_RESOURCE_ARRAY(char, end);
strncpy(buffer, oldbuf, buffer_pos);
if (buffer_pos > 0) {
memcpy(buffer, oldbuf, buffer_pos);
}
buffer_length = end;
}
}
// invariant: buffer is always null-terminated
guarantee(buffer_pos + write_len + 1 <= buffer_length, "stringStream oob");
buffer[buffer_pos + write_len] = 0;
strncpy(buffer + buffer_pos, s, write_len);
buffer_pos += write_len;
if (write_len > 0) {
buffer[buffer_pos + write_len] = 0;
memcpy(buffer + buffer_pos, s, write_len);
buffer_pos += write_len;
}
// Note that the following does not depend on write_len.
// This means that position and count get updated