mirror/darkhttpd
1
0
Fork 0
mirror of https://github.com/emikulic/darkhttpd.git synced 2023-08-10 21:13:08 +03:00
Code Issues Projects Releases Wiki Activity

Make sure malloc and realloc can't be called with size 0.

Browse Source 
Make pool size double instead of increment in make_sorted_dirlist().

Prompted by: clang static analyzer.
This commit is contained in:
Emil Mikulic 2013-04-28 21:37:31 +10:00
parent efe37364eb
commit a20e840c97
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
darkhttpd.c
View File

@ -1519,8 +1519,8 @@ static int dlent_cmp(const void *a, const void *b) {
static ssize_t make_sorted_dirlist(const char *path, struct dlent ***output) { static ssize_t make_sorted_dirlist(const char *path, struct dlent ***output) {
DIR *dir; DIR *dir;
struct dirent *ent; struct dirent *ent;
size_t entries = 0, pool = 0; size_t entries = 0;
#define POOL_INCR 100 size_t pool = 128;
char *currname; char *currname;
struct dlent **list = NULL; struct dlent **list = NULL;
@ -1529,6 +1529,7 @@ static ssize_t make_sorted_dirlist(const char *path, struct dlent ***output) {
return -1; return -1;
currname = xmalloc(strlen(path) + MAXNAMLEN + 1); currname = xmalloc(strlen(path) + MAXNAMLEN + 1);
list = xmalloc(sizeof(struct dlent*) * pool);
/* construct list */ /* construct list */
while ((ent = readdir(dir)) != NULL) { while ((ent = readdir(dir)) != NULL) {
@ -1541,7 +1542,7 @@ static ssize_t make_sorted_dirlist(const char *path, struct dlent ***output) {
if (stat(currname, &s) == -1) if (stat(currname, &s) == -1)
continue; /* skip un-stat-able files */ continue; /* skip un-stat-able files */
if (entries == pool) { if (entries == pool) {
pool += POOL_INCR; pool *= 2;
list = xrealloc(list, sizeof(struct dlent*) * pool); list = xrealloc(list, sizeof(struct dlent*) * pool);
} }
list[entries] = xmalloc(sizeof(struct dlent)); list[entries] = xmalloc(sizeof(struct dlent));
@ -1552,12 +1553,9 @@ static ssize_t make_sorted_dirlist(const char *path, struct dlent ***output) {
} }
closedir(dir); closedir(dir);
free(currname); free(currname);
assert(list != NULL); qsort(list, entries, sizeof(struct dlent*), dlent_cmp);
if (list) /* there's gotta be at least ".." */ *output = list;
qsort(list, entries, sizeof(struct dlent*), dlent_cmp);
*output = xrealloc(list, sizeof(struct dlent*) * entries);
return (ssize_t)entries; return (ssize_t)entries;
#undef POOL_INCR
} }
/* Cleanly deallocate a sorted list of directory files. */ /* Cleanly deallocate a sorted list of directory files. */
@ -1611,7 +1609,7 @@ static void generate_dir_listing(struct connection *conn, const char *path) {
char date[DATE_LEN], *spaces; char date[DATE_LEN], *spaces;
struct dlent **list; struct dlent **list;
ssize_t listsize; ssize_t listsize;
size_t maxlen = 0; size_t maxlen = 2; /* There has to be ".." */
int i; int i;
struct apbuf *listing = make_apbuf(); struct apbuf *listing = make_apbuf();