Merge pull request #630 from 1ace/fix/obob

Fix off-by-one bug in log functions
This commit is contained in:
Drew DeVault 2016-05-02 08:13:21 -04:00
commit 0d51a082e7

View file

@ -68,7 +68,7 @@ void _sway_log(log_importance_t verbosity, const char* format, ...) {
#endif #endif
if (verbosity <= v) { if (verbosity <= v) {
unsigned int c = verbosity; unsigned int c = verbosity;
if (c > sizeof(verbosity_colors) / sizeof(char *)) { if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
c = sizeof(verbosity_colors) / sizeof(char *) - 1; c = sizeof(verbosity_colors) / sizeof(char *) - 1;
} }
@ -96,7 +96,7 @@ void _sway_log(log_importance_t verbosity, const char* format, ...) {
void sway_log_errno(log_importance_t verbosity, char* format, ...) { void sway_log_errno(log_importance_t verbosity, char* format, ...) {
if (verbosity <= v) { if (verbosity <= v) {
unsigned int c = verbosity; unsigned int c = verbosity;
if (c > sizeof(verbosity_colors) / sizeof(char *)) { if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
c = sizeof(verbosity_colors) / sizeof(char *) - 1; c = sizeof(verbosity_colors) / sizeof(char *) - 1;
} }