LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-21 18:37:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Core/SecretString: Use memset_s instead of explicit_bzero on MacOS

Browse Source 
MacOS doesn't have `explicit_bzero`, so this was causing errors when
compiling LibCore on the host.
This commit is contained in:
Mustafa Quraish 2021-09-12 12:47:00 -04:00 committed by Brian Gianforcaro
parent 871ef7a735
commit 500a3fb2a7
Notes: sideshowbarker 2024-07-18 04:07:15 +09:00 
Author: https://github.com/mustafaquraish
Commit: https://github.com/SerenityOS/serenity/commit/500a3fb2a7a
Pull-request: https://github.com/SerenityOS/serenity/pull/10004
Reviewed-by: https://github.com/bgianfo ✅
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Userland/Libraries/LibCore/SecretString.cpp
View File

@ -1,10 +1,15 @@
/*
* Copyright (c) 2021, Brian Gianforcaro <bgianf@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@cs.toronto.edu>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/Platform.h>
#include <LibCore/SecretString.h>
#if defined(AK_OS_MACOS)
# define __STDC_WANT_LIB_EXT1__ 1
#endif
#include <string.h>
namespace Core {
@ -14,7 +19,11 @@ SecretString SecretString::take_ownership(char*& cstring, size_t length)
auto buffer = ByteBuffer::copy(cstring, length);
VERIFY(buffer.has_value());
#if defined(AK_OS_MACOS)
memset_s(cstring, length, 0, length);
#else
explicit_bzero(cstring, length);
#endif
free(cstring);
return SecretString(buffer.release_value());
@ -32,10 +41,14 @@ SecretString::SecretString(ByteBuffer&& buffer)
SecretString::~SecretString()
{
if (!m_secure_buffer.is_empty()) {
// Note: We use explicit_bzero to avoid the zeroing from being optimized out by the compiler,
// which is possible if memset was to be used here.
if (!m_secure_buffer.is_empty()) {
#if defined(AK_OS_MACOS)
memset_s(m_secure_buffer.data(), m_secure_buffer.size(), 0, m_secure_buffer.size());
#else
explicit_bzero(m_secure_buffer.data(), m_secure_buffer.capacity());
#endif
}
}