nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-22 13:35:03 -05:00
Code Issues Projects Releases Wiki Activity

Check the two popen() calls in noise_get_heavy for NULL.

Browse Source 
[originally from svn r8411]
This commit is contained in:
Simon Tatham 2009-01-13 18:18:35 +00:00
parent 201c2c295b
commit 464aa76aaf
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
unix/uxnoise.c
View File

@ -4,6 +4,9 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
@ -47,19 +50,34 @@ void noise_get_heavy(void (*func) (void *, int))
char buf[512]; char buf[512];
FILE *fp; FILE *fp;
int ret; int ret;
int got_dev_urandom = 0;
if (read_dev_urandom(buf, 32)) if (read_dev_urandom(buf, 32)) {
got_dev_urandom = 1;
func(buf, 32); func(buf, 32);
}
fp = popen("ps -axu 2>/dev/null", "r"); fp = popen("ps -axu 2>/dev/null", "r");
while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0) if (fp) {
func(buf, ret); while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0)
pclose(fp); func(buf, ret);
pclose(fp);
} else if (!got_dev_urandom) {
fprintf(stderr, "popen: %s\n"
"Unable to access fallback entropy source\n", strerror(errno));
exit(1);
}
fp = popen("ls -al /tmp 2>/dev/null", "r"); fp = popen("ls -al /tmp 2>/dev/null", "r");
while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0) if (fp) {
func(buf, ret); while ( (ret = fread(buf, 1, sizeof(buf), fp)) > 0)
pclose(fp); func(buf, ret);
pclose(fp);
} else if (!got_dev_urandom) {
fprintf(stderr, "popen: %s\n"
"Unable to access fallback entropy source\n", strerror(errno));
exit(1);
}
read_random_seed(func); read_random_seed(func);
random_save_seed(); random_save_seed();