Skip to content

Fix: Prevent crash on OOM in error copy #1183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix: Prevent crash on OOM in error copy #1183

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c000e9c
Add NUL character at the end of copied error message
schreter Feb 24, 2023
eec29dc
Fix: Prevent crash on OOM in error copy
schreter Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/cxx.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,9 +448,14 @@ static_assert(!std::is_same<Vec<std::uint8_t>::const_iterator,
Vec<std::uint8_t>::iterator>::value,
"Vec<T>::const_iterator != Vec<T>::iterator");

static const char *errorCopy(const char *ptr, std::size_t len) {
char *copy = new char[len];
std::memcpy(copy, ptr, len);
// Copy the error message into a private buffer and return it.
// If the allocation fails, nullptr is returned.
static const char *errorCopy(const char *ptr, std::size_t len) noexcept {
char *copy = new (std::nothrow) char[len + 1];
if (copy) {
std::memcpy(copy, ptr, len);
copy[len] = 0;
}
return copy;
}

Expand Down Expand Up @@ -496,7 +501,12 @@ Error &Error::operator=(Error &&other) &noexcept {
return *this;
}

const char *Error::what() const noexcept { return this->msg; }
const char *Error::what() const noexcept {
if (this->msg)
return this->msg;
else
return "<message not allocated>";
}

namespace {
template <typename T>
Expand Down