Skip to content

Sync 20260206b #25

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
mannfredcom merged 3 commits into from
Feb 6, 2026
Merged

Sync 20260206b #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
025ca5b
assert(dsize >= count) in rb_strlcpy(), I think all of our use cases …
synandro Feb 6, 2026
8d90006
remove unused variable
synandro Feb 6, 2026
281012e
fix stupid rb_strnlen macro
synandro Feb 6, 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
4 changes: 3 additions & 1 deletion libratbox/include/rb_tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ rb_strlcat(char *dest, const char *src, size_t count)
size_t len = strlen(src);
size_t res = dsize + len;

assert(dsize >= count);
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Fix inverted assert in rb_strlcat

The new assert(dsize >= count) is inverted: in normal, safe use of rb_strlcat, dsize is usually less than count. This assertion will therefore abort debug builds on valid inputs (e.g., when there is room in the destination buffer), while it does nothing to guard the actual overflow case (dsize >= count, which should short-circuit or return). This changes behavior from “works in release and debug” to “debug-only crash” for standard usage.

Useful? React with 👍 / 👎.


dest += dsize;
count -= dsize;
if(len >= count)
Expand Down Expand Up @@ -101,7 +103,7 @@ rb_strnlen(const char *s, size_t n)
return p;
}
#else
#define rb_strnlen(x) strnlen(x)
#define rb_strnlen(s, n) strnlen(s, n)
#endif

static inline char *
Expand Down
1 change: 0 additions & 1 deletion modules/m_topic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
{
struct Channel *chptr = NULL;
struct membership *msptr;
char *p = NULL;

if(MyClient(source_p) && !IsFloodDone(source_p))
flood_endgrace(source_p);
Expand Down