sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

debug: In dbghdrclass, don't call strlen repeatedly

Browse Source 
Also properly protect against header_str overflow

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Volker Lendecke
2014-07-30 09:22:21 +00:00
committed by Michael Adam
parent 200d94e563
commit 06a0b1c851
1 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/util/debug.c
View File

@ -955,6 +955,7 @@ bool dbghdrclass(int level, int cls, const char *location, const char *func)
int old_errno = errno;
bool verbose = false;
char header_str[200];
size_t hs_len;
struct timeval tv;
struct timeval_buf tvbuf;
@ -990,45 +991,64 @@ bool dbghdrclass(int level, int cls, const char *location, const char *func)
GetTimeOfDay(&tv);
timeval_str_buf(&tv, state.settings.debug_hires_timestamp, &tvbuf);
snprintf(header_str, sizeof(header_str), "[%s, %2d",
tvbuf.buf, level);
hs_len = snprintf(header_str, sizeof(header_str), "[%s, %2d",
tvbuf.buf, level);
if (hs_len >= sizeof(header_str)) {
goto full;
}
if (unlikely(DEBUGLEVEL_CLASS[ cls ] >= 10)) {
verbose = true;
}
if (verbose || state.settings.debug_pid) {
size_t hs_len = strlen(header_str);
snprintf(header_str + hs_len, sizeof(header_str) - hs_len,
", pid=%u", (unsigned int)getpid());
hs_len += snprintf(
header_str + hs_len, sizeof(header_str) - hs_len,
", pid=%u", (unsigned int)getpid());
if (hs_len >= sizeof(header_str)) {
goto full;
}
}
if (verbose || state.settings.debug_uid) {
size_t hs_len = strlen(header_str);
snprintf(header_str + hs_len, sizeof(header_str) - hs_len,
", effective(%u, %u), real(%u, %u)",
(unsigned int)geteuid(), (unsigned int)getegid(),
(unsigned int)getuid(), (unsigned int)getgid());
hs_len += snprintf(
header_str + hs_len, sizeof(header_str) - hs_len,
", effective(%u, %u), real(%u, %u)",
(unsigned int)geteuid(), (unsigned int)getegid(),
(unsigned int)getuid(), (unsigned int)getgid());
if (hs_len >= sizeof(header_str)) {
goto full;
}
}
if ((verbose || state.settings.debug_class)
&& (cls != DBGC_ALL)) {
size_t hs_len = strlen(header_str);
snprintf(header_str + hs_len,
sizeof(header_str) - hs_len,
", class=%s",
classname_table[cls]);
hs_len += snprintf(
header_str + hs_len, sizeof(header_str) - hs_len,
", class=%s", classname_table[cls]);
if (hs_len >= sizeof(header_str)) {
goto full;
}
}
strlcat(header_str, "] ", sizeof(header_str));
/*
* No +=, see man man strlcat
*/
hs_len = strlcat(header_str, "] ", sizeof(header_str));
if (hs_len >= sizeof(header_str)) {
goto full;
}
if (!state.settings.debug_prefix_timestamp) {
size_t hs_len = strlen(header_str);
snprintf(header_str + hs_len,
sizeof(header_str) - hs_len,
"%s(%s)\n", location, func);
hs_len += snprintf(
header_str + hs_len, sizeof(header_str) - hs_len,
"%s(%s)\n", location, func);
if (hs_len >= sizeof(header_str)) {
goto full;
}
}
full:
(void)Debug1(header_str);
errno = old_errno;