More work on overlay. Fixed nasty srandomdev() segfault bug.

This commit is contained in:
gardners 2011-04-30 23:22:22 +09:30
parent 0df58d2514
commit b9f5448cc1
2 changed files with 4 additions and 2 deletions

View File

@ -22,7 +22,6 @@
int overlay_socket=-1;
typedef struct overlay_buffer {
unsigned char *bytes;
int length;
@ -291,6 +290,8 @@ int overlay_payload_package_fmt1(overlay_payload *p,overlay_buffer *b)
if (ob_append_bytes(b,headers->bytes,headers->length)) fail++;
if (ob_append_bytes(b,p->payload,p->payloadLength)) fail++;
/* XXX SIGNATURE! */
ob_free(headers);
if (fail) { ob_rewind(b); return -1; } else return 0;

View File

@ -68,7 +68,8 @@ srandomdev(void)
#ifndef WIN32
FILE *fd;
if ((fd = fopen("/dev/urandom", O_RDONLY)) >= 0) {
fd = fopen("/dev/urandom", "r");
if (fd >= 0) {
fread(&seed, sizeof seed, 1, fd);
fclose(fd);
} else