Franscobec/gpufetch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v0.05] Fix a bug that caused segfault when terminal size cannot be retrieved (e.g, redirection)

Browse Source
This commit is contained in:
Dr-Noob
2021-08-16 22:07:52 +02:00
parent ad75c7e6ca
commit 6afe26f884
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/printer.cpp
View File

@@ -27,6 +27,7 @@
#define max(a,b) (((a)>(b))?(a):(b)) #define max(a,b) (((a)>(b))?(a):(b))
#define MAX_ATTRIBUTES 100 #define MAX_ATTRIBUTES 100
#define MAX_TERM_SIZE 1024
enum { enum {
ATTRIBUTE_NAME, ATTRIBUTE_NAME,
@@ -360,7 +361,7 @@ bool print_gpufetch_cuda(struct gpu_info* gpu, STYLE s, struct color** cs, struc
char* mem = (char *) emalloc(sizeof(char) * (strlen(mem_size) + strlen(mem_type) + 2)); char* mem = (char *) emalloc(sizeof(char) * (strlen(mem_size) + strlen(mem_type) + 2));
sprintf(mem, "%s %s", mem_size, mem_type); sprintf(mem, "%s %s", mem_size, mem_type);
char* uarch_cc = (char *) emalloc(sizeof(char) * (strlen(uarch) + strlen(comp_cap) + 3)); char* uarch_cc = (char *) emalloc(sizeof(char) * (strlen(uarch) + strlen(comp_cap) + 4));
sprintf(uarch_cc, "%s (%s)", uarch, comp_cap); sprintf(uarch_cc, "%s (%s)", uarch, comp_cap);
setAttribute(art, ATTRIBUTE_NAME, gpu_name); setAttribute(art, ATTRIBUTE_NAME, gpu_name);
@@ -409,15 +410,19 @@ struct terminal* get_terminal_size() {
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
if(GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi) == 0) { if(GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi) == 0) {
printWarn("GetConsoleScreenBufferInfo failed"); printWarn("GetConsoleScreenBufferInfo failed");
return NULL; term->w = MAX_TERM_SIZE;
term->h = MAX_TERM_SIZE;
return term;
} }
term->w = csbi.srWindow.Right - csbi.srWindow.Left + 1; term->w = csbi.srWindow.Right - csbi.srWindow.Left + 1;
term->h = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; term->h = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
#else #else
struct winsize w; struct winsize w;
if(ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == -1) { if(ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) == -1) {
printErr("ioctl: %s", strerror(errno)); printWarn("get_terminal_size: ioctl: %s", strerror(errno));
return NULL; term->w = MAX_TERM_SIZE;
term->h = MAX_TERM_SIZE;
return term;
} }
term->h = w.ws_row; term->h = w.ws_row;
term->w = w.ws_col; term->w = w.ws_col;