marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in print_memory (#427)

Browse Source 
Fixes a stack-overflow when memory is, for example, "1020.17 TiB".

This fix limits the max number of memory decimals to 4.

The crash was probably introduced in 066e813331 .
This commit is contained in:
Jordan Galby 2020-10-08 09:15:43 +00:00 committed by GitHub
parent 3451a0d9fc
commit 8bcf5491d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/print_mem.c
View File

@ -7,7 +7,8 @@
#include <yajl/yajl_version.h> #include <yajl/yajl_version.h>
#include "i3status.h" #include "i3status.h"
#define STRING_SIZE 10 #define MAX_DECIMALS 4
#define STRING_SIZE ((sizeof "1023. TiB") + MAX_DECIMALS)
#define BINARY_BASE 1024UL #define BINARY_BASE 1024UL
@ -32,7 +33,8 @@ static int print_bytes_human(char *outwalk, unsigned long bytes, const char *uni
base /= BINARY_BASE; base /= BINARY_BASE;
exponent += 1; exponent += 1;
} }
return sprintf(outwalk, "%.*f %s", decimals, base, iec_symbols[exponent]); const int prec = decimals > MAX_DECIMALS ? MAX_DECIMALS : decimals;
return sprintf(outwalk, "%.*f %s", prec, base, iec_symbols[exponent]);
} }
static int print_percentage(char *outwalk, float percent) { static int print_percentage(char *outwalk, float percent) {