security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

2002-09-04 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* asschk.c (start_server): Close the parent's file descriptors in
	the child.
	(read_assuan): Variable NREAD removed.  Cut off the received line
	currectly if more than one line was read.
This commit is contained in:
Marcus Brinkmann 2002-09-04 13:04:49 +00:00
parent 836d63c0f5
commit cfca45dcd5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/ChangeLog
View File

@ -1,3 +1,10 @@
2002-09-04 Marcus Brinkmann <marcus@g10code.de>
* asschk.c (start_server): Close the parent's file descriptors in
the child.
(read_assuan): Variable NREAD removed. Cut off the received line
currectly if more than one line was read.
2002-09-03 Neal H. Walfield <neal@cs.uml.edu> 2002-09-03 Neal H. Walfield <neal@cs.uml.edu>
* Makefile.am (inittests.stamp): Construct an LD_LIBRARY_PATH from * Makefile.am (inittests.stamp): Construct an LD_LIBRARY_PATH from

9
tests/asschk.c
View File

@ -267,7 +267,6 @@ read_assuan (int fd)
size_t nleft = sizeof recv_line; size_t nleft = sizeof recv_line;
char *buf = recv_line; char *buf = recv_line;
char *p; char *p;
int nread = 0;
while (nleft > 0) while (nleft > 0)
{ {
@ -294,7 +293,6 @@ read_assuan (int fd)
p = buf; p = buf;
nleft -= n; nleft -= n;
buf += n; buf += n;
nread += n;
for (; n && *p != '\n'; n--, p++) for (; n && *p != '\n'; n--, p++)
; ;
@ -303,16 +301,15 @@ read_assuan (int fd)
if (n>1) if (n>1)
{ {
n--; n--;
memcpy (pending, p+1, n); memcpy (pending, p + 1, n);
pending_len = n; pending_len = n;
} }
*p = '\0';
break; break;
} }
} }
if (!nleft) if (!nleft)
die ("received line too large"); die ("received line too large");
assert (nread>0);
recv_line[nread-1] = 0;
p = recv_line; p = recv_line;
if (p[0] == 'O' && p[1] == 'K' && (p[2] == ' ' || !p[2])) if (p[0] == 'O' && p[1] == 'K' && (p[2] == ' ' || !p[2]))
@ -420,6 +417,8 @@ start_server (const char *pgmname)
close (fd); close (fd);
} }
close (wp[1]);
close (rp[0]);
execl (pgmname, arg0, "--server", NULL); execl (pgmname, arg0, "--server", NULL);
die ("exec failed for `%s': %s", pgmname, strerror (errno)); die ("exec failed for `%s': %s", pgmname, strerror (errno));
} }