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

ftpd: fix command fetching to not do it in 1-byte reads;

Browse Source 
fix command de-escaping. Tested to download files with embeeded \xff and LF.
libbb: tweaks for the above

function                                             old     new   delta
ftpd_main                                           2231    2321     +90
xmalloc_fgets_internal                               190     222     +32
xmalloc_fgets_str_len                                  -      27     +27
xmalloc_fgets_str                                      7      23     +16
xmalloc_fgetline_str                                  10      26     +16
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 4/0 up/down: 181/0)             Total: 181 bytes
This commit is contained in:
Denis Vlasenko
2009-03-18 17:32:44 +00:00
parent fce4a9454c
commit 9f57cf6604
4 changed files with 80 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libbb/fgets_str.c
View File

@ -10,7 +10,7 @@
#include "libbb.h"
static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, int chop_off)
static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, int chop_off, size_t *maxsz_p)
{
char *linebuf = NULL;
const int term_length = strlen(terminating_string);
@ -18,6 +18,7 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
int linebufsz = 0;
int idx = 0;
int ch;
size_t maxsz = *maxsz_p;
while (1) {
ch = fgetc(file);
@ -30,6 +31,11 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
if (idx >= linebufsz) {
linebufsz += 200;
linebuf = xrealloc(linebuf, linebufsz);
if (idx >= maxsz) {
linebuf[idx] = ch;
idx++;
break;
}
}
linebuf[idx] = ch;
@ -48,6 +54,7 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
/* Grow/shrink *first*, then store NUL */
linebuf = xrealloc(linebuf, idx + 1);
linebuf[idx] = '\0';
*maxsz_p = idx;
return linebuf;
}
@ -57,10 +64,23 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
* Return NULL if EOF is reached immediately. */
char* FAST_FUNC xmalloc_fgets_str(FILE *file, const char *terminating_string)
{
return xmalloc_fgets_internal(file, terminating_string, 0);
size_t maxsz = INT_MAX - 4095;
return xmalloc_fgets_internal(file, terminating_string, 0, &maxsz);
}
char* FAST_FUNC xmalloc_fgets_str_len(FILE *file, const char *terminating_string, size_t *maxsz_p)
{
size_t maxsz;
if (!maxsz_p) {
maxsz = INT_MAX - 4095;
maxsz_p = &maxsz;
}
return xmalloc_fgets_internal(file, terminating_string, 0, maxsz_p);
}
char* FAST_FUNC xmalloc_fgetline_str(FILE *file, const char *terminating_string)
{
return xmalloc_fgets_internal(file, terminating_string, 1);
size_t maxsz = INT_MAX - 4095;
return xmalloc_fgets_internal(file, terminating_string, 1, &maxsz);
}

6
libbb/read.c
View File

@ -141,7 +141,7 @@ char* FAST_FUNC xmalloc_reads(int fd, char *buf, size_t *maxsz_p)
{
char *p;
size_t sz = buf ? strlen(buf) : 0;
size_t maxsz = maxsz_p ? *maxsz_p : MAXINT(size_t);
size_t maxsz = maxsz_p ? *maxsz_p : (INT_MAX - 4095);
goto jump_in;
while (sz < maxsz) {
@ -198,7 +198,7 @@ void* FAST_FUNC xmalloc_read(int fd, size_t *maxsz_p)
size_t to_read;
struct stat st;
to_read = maxsz_p ? *maxsz_p : MAXINT(ssize_t); /* max to read */
to_read = maxsz_p ? *maxsz_p : (INT_MAX - 4095); /* max to read */
/* Estimate file size */
st.st_size = 0; /* in case fstat fails, assume 0 */
@ -262,7 +262,7 @@ void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *maxsz_p)
len = lseek(fd, 0, SEEK_END) | 0x3ff; /* + up to 1k */
if (len != (off_t)-1) {
xlseek(fd, 0, SEEK_SET);
size = maxsz_p ? *maxsz_p : INT_MAX;
size = maxsz_p ? *maxsz_p : (INT_MAX - 4095);
if (len < size)
size = len;
}