Skip to content

Fix/multiple fixes #5

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

Merged
frapank merged 3 commits into from
Jun 22, 2026
Merged

Fix/multiple fixes #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e8cbf0
fix: dstrfree don't use the custom DSTR_FREE() call
frapank Jun 22, 2026
ac7c3b3
fix: buffer overflow in dstrnew_custom() if msg="" and cap=0 is passed
frapank Jun 22, 2026
42ffeac
fix: inconsistency in dstrfree()
frapank Jun 22, 2026
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
12 changes: 6 additions & 6 deletions dstr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ dstr dstrnew_custom(const char* msg, size_t cap)
if (!msg)
return NULL;
size_t s_len = strlen(msg);
size_t alloc_size = (s_len > cap) ? (s_len + 1) : cap;
size_t alloc_size = (s_len + 1 > cap) ? (s_len + 1) : cap;

enum dstrhd_type t = _dstr_type_by_size(alloc_size);

Expand All @@ -538,23 +538,23 @@ void dstrfree(dstr s)
{
if (!s)
return;
enum dstrhd_type t = s[-1];
enum dstrhd_type t = DSTRGETTYPE(s);

switch (t) {
case DSTRHD_TYPE_8: {
free(DSTRGETHDR(8, s));
DSTR_FREE(DSTRGETHDR(8, s));
return;
}
case DSTRHD_TYPE_16: {
free(DSTRGETHDR(16, s));
DSTR_FREE(DSTRGETHDR(16, s));
return;
}
case DSTRHD_TYPE_32: {
free(DSTRGETHDR(32, s));
DSTR_FREE(DSTRGETHDR(32, s));
return;
}
case DSTRHD_TYPE_64: {
free(DSTRGETHDR(64, s));
DSTR_FREE(DSTRGETHDR(64, s));
return;
}
}
Expand Down
Loading