mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:27:34 +00:00
Everywhere: Port to String::copy_characters_to_buffer()
This commit is contained in:
parent
be6cce5530
commit
852454746e
8 changed files with 39 additions and 18 deletions
|
@ -304,10 +304,9 @@ size_t strftime(char* destination, size_t max_size, const char* format, const st
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (builder.length() + 1 > max_size)
|
||||
return 0;
|
||||
strcpy(destination, builder.build().characters());
|
||||
return builder.length();
|
||||
auto str = builder.build();
|
||||
bool fits = str.copy_characters_to_buffer(destination, max_size);
|
||||
return fits ? str.length() : 0;
|
||||
}
|
||||
|
||||
long timezone = 0;
|
||||
|
|
|
@ -112,13 +112,12 @@ bool Socket::connect(const SocketAddress& address)
|
|||
sockaddr_un saddr;
|
||||
saddr.sun_family = AF_LOCAL;
|
||||
auto dest_address = address.to_string();
|
||||
if (dest_address.length() >= sizeof(saddr.sun_path)) {
|
||||
bool fits = dest_address.copy_characters_to_buffer(saddr.sun_path, sizeof(saddr.sun_path));
|
||||
if (!fits) {
|
||||
fprintf(stderr, "Core::Socket: Failed to connect() to %s: Path is too long!\n", dest_address.characters());
|
||||
errno = EINVAL;
|
||||
return false;
|
||||
}
|
||||
strcpy(saddr.sun_path, address.to_string().characters());
|
||||
|
||||
m_destination_address = address;
|
||||
|
||||
return common_connect((const sockaddr*)&saddr, sizeof(saddr));
|
||||
|
|
|
@ -87,10 +87,9 @@ public:
|
|||
ASSERT(type() == Type::Local);
|
||||
sockaddr_un address;
|
||||
address.sun_family = AF_LOCAL;
|
||||
if (m_local_address.length() >= sizeof(address.sun_path)) {
|
||||
bool fits = m_local_address.copy_characters_to_buffer(address.sun_path, sizeof(address.sun_path));
|
||||
if (!fits)
|
||||
return {};
|
||||
}
|
||||
strcpy(address.sun_path, m_local_address.characters());
|
||||
return address;
|
||||
}
|
||||
|
||||
|
|
|
@ -55,7 +55,11 @@ char* crypt_r(const char* key, const char* salt, struct crypt_data* data)
|
|||
size_t salt_len = min(strcspn(salt_value, "$"), crypt_salt_max);
|
||||
size_t header_len = salt_len + 3;
|
||||
|
||||
strncpy(data->result, salt, header_len);
|
||||
bool fits = String(salt, header_len).copy_characters_to_buffer(data->result, sizeof(data->result));
|
||||
if (!fits) {
|
||||
errno = EINVAL;
|
||||
return nullptr;
|
||||
}
|
||||
data->result[header_len] = '$';
|
||||
|
||||
Crypto::Hash::SHA256 sha;
|
||||
|
@ -65,7 +69,11 @@ char* crypt_r(const char* key, const char* salt, struct crypt_data* data)
|
|||
auto digest = sha.digest();
|
||||
auto string = encode_base64(ReadonlyBytes(digest.immutable_data(), digest.data_length()));
|
||||
|
||||
strncpy(data->result + header_len + 1, string.characters(), sha_string_length);
|
||||
fits = string.copy_characters_to_buffer(data->result + header_len + 1, sizeof(data->result) - header_len - 1);
|
||||
if (!fits) {
|
||||
errno = EINVAL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return data->result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue