From 025ca5b4811060f0300fad401d5d825ee274e5be Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Fri, 6 Feb 2026 08:19:14 -0500 Subject: [PATCH 1/3] assert(dsize >= count) in rb_strlcpy(), I think all of our use cases are fine fwiw. --- libratbox/include/rb_tools.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libratbox/include/rb_tools.h b/libratbox/include/rb_tools.h index f77bfa31..d1b3dc8d 100644 --- a/libratbox/include/rb_tools.h +++ b/libratbox/include/rb_tools.h @@ -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); + dest += dsize; count -= dsize; if(len >= count) From 8d900069948b9ab61e960ff1f90575e8afe40533 Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Fri, 6 Feb 2026 08:28:05 -0500 Subject: [PATCH 2/3] remove unused variable --- modules/m_topic.c | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/m_topic.c b/modules/m_topic.c index b1713968..aff60123 100644 --- a/modules/m_topic.c +++ b/modules/m_topic.c @@ -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); From 281012eb505afbb04169a06613143fb546c4051a Mon Sep 17 00:00:00 2001 From: Aaron Sethman Date: Fri, 6 Feb 2026 14:50:08 -0500 Subject: [PATCH 3/3] fix stupid rb_strnlen macro --- libratbox/include/rb_tools.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libratbox/include/rb_tools.h b/libratbox/include/rb_tools.h index d1b3dc8d..fa813243 100644 --- a/libratbox/include/rb_tools.h +++ b/libratbox/include/rb_tools.h @@ -103,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 *