RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 14:17:42 +00:00
Code Issues Activity Actions

LibCore: Propagate errors in SecretString

Browse source
This commit is contained in:
Undefine 2023-02-04 18:52:06 +01:00 • committed by Andreas Kling
parent b4f47935a5
commit ccc871e608
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibCore/GetPassword.cpp
View file

@ -40,6 +40,6 @@ ErrorOr<SecretString> get_password(StringView prompt)
// Remove trailing '\n' read by getline(). // Remove trailing '\n' read by getline().
password[line_length - 1] = '\0'; password[line_length - 1] = '\0';
return SecretString::take_ownership(password, line_length); return TRY(SecretString::take_ownership(password, line_length));
} }
} }

4
Userland/Libraries/LibCore/SecretString.cpp
View file

@ -10,9 +10,9 @@
namespace Core { namespace Core {
SecretString SecretString::take_ownership(char*& cstring, size_t length) ErrorOr<SecretString> SecretString::take_ownership(char*& cstring, size_t length)
{ {
auto buffer = ByteBuffer::copy(cstring, length).release_value_but_fixme_should_propagate_errors(); auto buffer = TRY(ByteBuffer::copy(cstring, length));
secure_zero(cstring, length); secure_zero(cstring, length);
free(cstring); free(cstring);

2
Userland/Libraries/LibCore/SecretString.h
View file

@ -16,7 +16,7 @@ class SecretString {
AK_MAKE_NONCOPYABLE(SecretString); AK_MAKE_NONCOPYABLE(SecretString);
public: public:
[[nodiscard]] static SecretString take_ownership(char*&, size_t); [[nodiscard]] static ErrorOr<SecretString> take_ownership(char*&, size_t);
[[nodiscard]] static SecretString take_ownership(ByteBuffer&&); [[nodiscard]] static SecretString take_ownership(ByteBuffer&&);
[[nodiscard]] bool is_empty() const { return m_secure_buffer.is_empty(); } [[nodiscard]] bool is_empty() const { return m_secure_buffer.is_empty(); }