Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-10-06 18:13:46 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Use thread-safe ttyname_r API, which also fixes a memory leak from glibc

Browse Source
This commit is contained in:
pancake 2024-09-17 17:29:39 +02:00 committed by pancake
parent 9293b8250d
commit 0cc50d5518
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libr/cons/cons.c
View File

@ -1566,10 +1566,11 @@ R_API bool r_cons_is_tty(void) {
if (!win.ws_col || !win.ws_row) {
return false;
}
const char *tty = ttyname (1);
if (!tty) {
char ttybuf[64];
if (ttyname_r (1, ttybuf, sizeof (ttybuf))) {
return false;
}
const char *tty = ttybuf;
if (stat (tty, &sb) || !S_ISCHR (sb.st_mode)) {
return false;
}
@ -1688,7 +1689,13 @@ R_API int r_cons_get_size(int *rows) {
struct winsize win = {0};
if (isatty (0) && !ioctl (0, TIOCGWINSZ, &win)) {
if ((!win.ws_col) || (!win.ws_row)) {
const char *tty = isatty (1)? ttyname (1): NULL;
char ttybuf[64];
const char *tty = NULL;
if (isatty (1)) {
if (!ttyname_r (1, ttybuf, sizeof (ttybuf))) {
tty = ttybuf;
}
}
int fd = open (r_str_get_fail (tty, "/dev/tty"), O_RDONLY);
if (fd != -1) {
int ret = ioctl (fd, TIOCGWINSZ, &win);