emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bb_askpass: shorten static password buffer. 256 is way too large.

Browse Source 
simplify code a bit.
This commit is contained in:
Denis Vlasenko
2006-09-23 12:22:11 +00:00
parent b97f07f5a1
commit 6429aabbf1
4 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libbb/bb_askpass.c
View File

@@ -17,8 +17,6 @@
#include <sys/ioctl.h>
#include "libbb.h"
#define PWD_BUFFER_SIZE 256
/* do nothing signal handler */
static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
@@ -27,18 +25,17 @@ static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
char *bb_askpass(int timeout, const char * prompt)
{
static char passwd[64];
char *ret;
int i, size;
int i;
struct sigaction sa;
struct termios old, new;
static char passwd[PWD_BUFFER_SIZE];
tcgetattr(STDIN_FILENO, &old);
tcflush(STDIN_FILENO, TCIFLUSH);
size = sizeof(passwd);
ret = passwd;
memset(passwd, 0, size);
memset(passwd, 0, sizeof(passwd));
fputs(prompt, stdout);
fflush(stdout);
@@ -55,15 +52,16 @@ char *bb_askpass(int timeout, const char * prompt)
alarm(timeout);
}
if (read(STDIN_FILENO, passwd, size-1) <= 0) {
ret = NULL;
} else {
for(i = 0; i < size && passwd[i]; i++) {
if (passwd[i]== '\r' || passwd[i] == '\n') {
passwd[i]= 0;
break;
}
}
ret = NULL;
if (read(STDIN_FILENO, passwd, sizeof(passwd)-1) > 0) {
ret = passwd;
i = 0;
/* Last byte is guaranteed to be 0
(read did not overwrite it) */
do {
if (passwd[i] == '\r' || passwd[i] == '\n')
passwd[i] = 0;
} while (passwd[i++]);
}
if (timeout) {
@@ -71,8 +69,7 @@ char *bb_askpass(int timeout, const char * prompt)
}
tcsetattr(STDIN_FILENO, TCSANOW, &old);
fputs("\n", stdout);
puts("");
fflush(stdout);
return ret;
}