nojhan/clutchlog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(depth): avoid overflow when manually setting depth

Browse source 
Setting the depth to INTMAX was overflowing if strep calls was also set,
resulting in no log triggered.
This commit is contained in:
Johann Dreo 2024-10-01 09:47:23 +02:00
commit c8d148cf97
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
clutchlog/clutchlog.h
View file

@ -32,6 +32,7 @@
#define CLUTCHLOG_HAVE_UNIX_SYSINFO 1 #define CLUTCHLOG_HAVE_UNIX_SYSINFO 1
#else #else
#define CLUTCHLOG_HAVE_UNIX_SYSINFO 0 #define CLUTCHLOG_HAVE_UNIX_SYSINFO 0
// #pragma message("[clutchlog] no POSIX SYSINFO header")
#endif #endif
//! True if the system can handle the `hfill` feature. //! True if the system can handle the `hfill` feature.
@ -42,6 +43,7 @@
#define CLUTCHLOG_HAVE_UNIX_SYSIOCTL 1 #define CLUTCHLOG_HAVE_UNIX_SYSIOCTL 1
#else #else
#define CLUTCHLOG_HAVE_UNIX_SYSIOCTL 0 #define CLUTCHLOG_HAVE_UNIX_SYSIOCTL 0
// #pragma message("[clutchlog] no POSIX SYSIOCTL header")
#endif #endif
@ -52,7 +54,12 @@
#ifndef NDEBUG #ifndef NDEBUG
//! Actually enable clutchlog features. //! Actually enable clutchlog features.
#define WITH_CLUTCHLOG #define WITH_CLUTCHLOG
// #pragma message("[clutchlog] automatically enabled")
// #else
// #pragma message("[clutchlog] automatically disabled")
#endif #endif
// #else
// #pragma message("[clutchlog] manually enabled")
#endif #endif
/********************************************************************** /**********************************************************************
@ -171,6 +178,7 @@
#define CLUTCHDUMP( LEVEL, CONTAINER, FILENAME ) do {/*nothing*/} while(0) #define CLUTCHDUMP( LEVEL, CONTAINER, FILENAME ) do {/*nothing*/} while(0)
#define CLUTCHFUNC( LEVEL, FUNC, ... ) do {/*nothing*/} while(0) #define CLUTCHFUNC( LEVEL, FUNC, ... ) do {/*nothing*/} while(0)
#define CLUTCHCODE( LEVEL, CODE ) do {/*nothing*/} while(0) #define CLUTCHCODE( LEVEL, CODE ) do {/*nothing*/} while(0)
// #pragma message("[clutchlog] fully disabled")
#endif // WITH_CLUTCHLOG #endif // WITH_CLUTCHLOG
/********************************************************************** /**********************************************************************
@ -999,7 +1007,9 @@ class clutchlog
#if CLUTCHLOG_HAVE_UNIX_SYSINFO == 1 #if CLUTCHLOG_HAVE_UNIX_SYSINFO == 1
//! Set the stack depth above which logs are not printed. //! Set the stack depth above which logs are not printed.
void depth(size_t d) {_depth = d;} void depth(size_t d) {
_depth = std::min(d, std::numeric_limits<size_t>::max() - _strip_calls);
}
//! Get the stack depth above which logs are not printed. //! Get the stack depth above which logs are not printed.
size_t depth() const {return _depth;} size_t depth() const {return _depth;}