upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better handling of some boundary conditions.

Browse source 
Submitted by:	ume
This commit is contained in:
Dag-Erling Smørgrav 2000-05-19 09:45:42 +00:00
parent 6ad135868c
commit 6efb30c8d0
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/libfetch/ftp.c
View file

@ -100,7 +100,8 @@ static size_t lr_size, lr_length;
static int last_code;
#define isftpreply(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
&& isdigit(foo[2]) && foo[3] == ' ')
&& isdigit(foo[2]) \
&& (foo[3] == ' ' || foo[3] == '\0'))
#define isftpinfo(foo) (isdigit(foo[0]) && isdigit(foo[1]) \
&& isdigit(foo[2]) && foo[3] == '-')
@ -238,11 +239,13 @@ _ftp_transfer(int cd, char *oper, char *file,
* is IMHO the one and only weak point in the FTP protocol.
*/
ln = last_reply;
for (p = ln + 3; !isdigit(*p); p++)
for (p = ln + 3; *p && !isdigit(*p); p++)
/* nothing */ ;
for (p--, i = 0; i < 6; i++) {
p++; /* skip the comma */
for (i = 0; *p, i < 6; i++, p++)
addr[i] = strtol(p, &p, 10);
if (i < 6) {
e = 999;
goto ouch;
}
/* seek to required offset */

2
lib/libfetch/http.c
View file

@ -135,6 +135,8 @@ _http_fillbuf(struct cookie *c)
} else if (c->encoding == ENC_CHUNKED) {
if (c->chunksize == 0) {
ln = fgetln(c->real_f, &len);
if (len <= 2)
return NULL;
DEBUG(fprintf(stderr, "\033[1m_http_fillbuf(): new chunk: "
"%*.*s\033[m\n", (int)len-2, (int)len-2, ln));
sscanf(ln, "%x", &(c->chunksize));