Skip to content

Sanitize printf format specifiers #21

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
urbasus wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Sanitize printf format specifiers #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0a795b
Add GCC/Clang printf sanitization to SLPDLog
urbasus Jan 5, 2026
db1b471
Fix format specifier for x86
urbasus Jan 5, 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: 2 additions & 2 deletions openslp/slpd/slpd_database.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,15 +429,15 @@ int SLPDDatabaseReg(SLPMessage * msg, SLPBuffer buf)
sizeof(struct sockaddr_storage));
if (ifaces.iface_addr == NULL)
{
fprintf(stderr, "iface_addr malloc(%lu) failed\n",
fprintf(stderr, "iface_addr malloc(%zu) failed\n",
slp_max_ifaces * sizeof(struct sockaddr_storage));
exit(1);
}
ifaces.bcast_addr = malloc(slp_max_ifaces *
sizeof(struct sockaddr_storage));
if (ifaces.bcast_addr == NULL)
{
fprintf(stderr, "bcast_addr malloc(%lu) failed\n",
fprintf(stderr, "bcast_addr malloc(%zu) failed\n",
slp_max_ifaces * sizeof(struct sockaddr_storage));
exit(1);
}
Expand Down
4 changes: 2 additions & 2 deletions openslp/slpd/slpd_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ void SLPDLogMessageInternals(SLPMessage * message)
SLPDLog("Header:\n");
SLPDLog(" version = %i\n", message->header.version);
SLPDLog(" functionid = %i\n", message->header.functionid);
SLPDLog(" length = %i\n", message->header.length);
SLPDLog(" length = %zu\n", message->header.length);
SLPDLog(" flags = %i\n", message->header.flags);
SLPDLog(" extoffset = %i\n", message->header.extoffset);
SLPDLog(" xid = %i\n", message->header.xid);
Expand Down Expand Up @@ -581,7 +581,7 @@ void SLPDLogParseWarning(struct sockaddr_storage * peeraddr, SLPBuffer buf)
SLPDLogTime();
SLPDLog("*** WARNING Parse Error ***\n");
SLPDLogPeerAddr(peeraddr);
SLPDLog("message size = %i\n",buf->end - buf->start);
SLPDLog("message size = %td\n",buf->end - buf->start);
SLPDLog("message dump follows:\n");
for (curpos = buf->start; curpos < buf->end; curpos++)
{
Expand Down
12 changes: 10 additions & 2 deletions openslp/slpd/slpd_log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,19 @@
#define SLPDLOG_TRACEMSG_IN (SLPDLOG_TRACEMSG | 0x00000001)
#define SLPDLOG_TRACEMSG_OUT (SLPDLOG_TRACEMSG | 0x00000002)

#if defined(__GNUC__) || defined(__clang__)
# define SLPDLOG_PRINTF_LIKE(fmt_index, first_arg) __attribute__((format(printf, fmt_index, first_arg)))
#else
# define SLPDLOG_PRINTF_LIKE(fmt_index, first_arg)
#endif

int SLPDLogFileOpen(const char * path, int append);
int SLPDLogFileClose(void);
void SLPDLogBuffer(const char * prefix, size_t bufsize, const char * buf);
void SLPDLog(const char * msg, ...);
void SLPDFatal(const char * msg, ...);
void SLPDLog(const char * msg, ...)
SLPDLOG_PRINTF_LIKE(1, 2);
void SLPDFatal(const char * msg, ...)
SLPDLOG_PRINTF_LIKE(1, 2);
void SLPDLogTime(void);
void SLPDLogMessageInternals(SLPMessage * message);
void SLPDLogMessage(int msglogflags, struct sockaddr_storage * peerinfo,
Expand Down