roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-stringtable2: DString: fail without ub when alloc fails

Browse source
This commit is contained in:
Roland Conybeare 2026-04-10 20:29:53 -04:00
commit 6c31b56132
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
xo-stringtable2/src/stringtable2/DString.cpp
View file

@ -26,14 +26,16 @@ namespace xo {
void * mem = mm.alloc(typeseq::id<DString>(),
sizeof(DString) + cap);
result = new (mem) DString();
if (mem) {
result = new (mem) DString();
assert(result);
assert(result);
result->capacity_ = cap;
result->size_ = 0;
if (cap > 0) {
result->chars_[0] = '\0';
result->capacity_ = cap;
result->size_ = 0;
if (cap > 0) {
result->chars_[0] = '\0';
}
}
}
@ -50,10 +52,15 @@ namespace xo {
void * mem = mm.alloc(typeseq::id<DString>(),
sizeof(DString) + cap);
DString * result = new (mem) DString();
result->capacity_ = cap;
result->size_ = len;
std::memcpy(result->chars_, cstr, cap);
DString * result = nullptr;
if (mem) {
result = new (mem) DString();
result->capacity_ = cap;
result->size_ = len;
std::memcpy(result->chars_, cstr, cap);
}
return result;
}