incubator/dirl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Stat full path, allocate enough space

Browse source 
Not stat'ing the full path (just entry->d_name) strangely works on glibc/fedora
but fails on musl/alpine. Stat'ing the full path is the right thing to do,
anyways.

There was a heap corruption in `dirl_find_templ_dir` due not allocating enough
space for the terminating NULL in `path_buf`. This again only showed up in
musl/alpine.
This commit is contained in:
Armin Friedl 2020-08-31 06:42:23 +02:00
parent d06c37fbd5
commit 66558aa615
3 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data.c
View file

@ -55,7 +55,7 @@ data_send_dirlisting(int fd, const struct response *res)
} }
/* entry line */ /* entry line */
if ((ret = dirl_entry(fd, e[i], &templates))) { if ((ret = dirl_entry(fd, e[i], res, &templates))) {
goto cleanup; goto cleanup;
} }

39
dirl.c
View file

@ -86,12 +86,12 @@ html_escape(const char* src, char* dst, size_t dst_siz)
static char* static char*
dirl_find_templ_dir(const char* start_path) dirl_find_templ_dir(const char* start_path)
{ {
char* path_buf = calloc(sizeof(char), strlen(start_path)); char* path_buf = calloc(sizeof(char), strlen(start_path)+1);
strcat(path_buf, start_path); strcat(path_buf, start_path);
if(strlen(path_buf) > 1 && path_buf[strlen(path_buf)-1] == '/') { if (strlen(path_buf) > 1 && path_buf[strlen(path_buf) - 1] == '/') {
// don't read last dir twice, except at root // don't read last dir twice, except at root
path_buf[strlen(path_buf)-1] = '\0'; path_buf[strlen(path_buf) - 1] = '\0';
} }
while (strlen(path_buf) != 0) { while (strlen(path_buf) != 0) {
@ -100,8 +100,8 @@ dirl_find_templ_dir(const char* start_path)
errno = 0; errno = 0;
while ((de = readdir(cur))) { while ((de = readdir(cur))) {
if (de->d_type == DT_REG) { if (de->d_type == DT_REG) {
if (strcmp(DIRL_HEADER, de->d_name) || strcmp(DIRL_ENTRY, de->d_name) || if (!strcmp(DIRL_HEADER, de->d_name) || !strcmp(DIRL_ENTRY, de->d_name) ||
strcmp(DIRL_FOOTER, de->d_name)) { !strcmp(DIRL_FOOTER, de->d_name)) {
closedir(cur); closedir(cur);
return path_buf; return path_buf;
} }
@ -112,7 +112,7 @@ dirl_find_templ_dir(const char* start_path)
char* parent = strrchr(path_buf, '/'); char* parent = strrchr(path_buf, '/');
(*parent) = '\0'; // strip tail from path_buf (*parent) = '\0'; // strip tail from path_buf
if(strlen(path_buf) == 0) { // we stripped root, let it loop once more if (strlen(path_buf) == 0) { // we stripped root, let it loop once more
path_buf[0] = '/'; path_buf[0] = '/';
path_buf[1] = '\0'; path_buf[1] = '\0';
} }
@ -168,8 +168,8 @@ enum status
dirl_header(int fd, const struct response* res, const struct dirl_templ* templ) dirl_header(int fd, const struct response* res, const struct dirl_templ* templ)
{ {
/* Replace placeholder */ /* Replace placeholder */
char* nhead = calloc(sizeof(char), strlen(templ->header)+1); char* nhead = calloc(sizeof(char), strlen(templ->header) + 1);
memcpy(nhead, templ->header, strlen(templ->header)+1); memcpy(nhead, templ->header, strlen(templ->header) + 1);
replace(&nhead, "{uri}", res->uri); replace(&nhead, "{uri}", res->uri);
/* Write header */ /* Write header */
@ -182,24 +182,29 @@ dirl_header(int fd, const struct response* res, const struct dirl_templ* templ)
} }
enum status enum status
dirl_entry(int fd, const struct dirent* entry, const struct dirl_templ* templ) dirl_entry(int fd,
const struct dirent* entry,
const struct response* res,
const struct dirl_templ* templ)
{ {
struct stat stat_buf; struct stat stat_buf;
lstat(entry->d_name, &stat_buf); char* path_buf = calloc(sizeof(char), strlen(res->path)+strlen(entry->d_name));
strcat(path_buf, res->path);
strcat(path_buf, entry->d_name);
lstat(path_buf, &stat_buf);
char* nentry = calloc(sizeof(char), strlen(templ->entry)+1); char* nentry = calloc(sizeof(char), strlen(templ->entry) + 1);
//strcat(nentry, templ->entry); memcpy(nentry, templ->entry, strlen(templ->entry) + 1);
memcpy(nentry, templ->entry, strlen(templ->entry)+1);
/* Replace placeholder */ /* Replace placeholder */
char esc[PATH_MAX * 6]; char esc[PATH_MAX * 6];
html_escape(entry->d_name, esc, PATH_MAX*6); html_escape(entry->d_name, esc, PATH_MAX * 6);
replace(&nentry, "{entry}", entry->d_name); replace(&nentry, "{entry}", entry->d_name);
replace(&nentry, "{suffix}", suffix(entry->d_type)); replace(&nentry, "{suffix}", suffix(entry->d_type));
char size_buf[1024]; char size_buf[1024];
if(entry->d_type == DT_REG) { if (entry->d_type == DT_REG) {
snprintf(size_buf, 1024, "%ld", stat_buf.st_size); snprintf(size_buf, 1024, "%ld", stat_buf.st_size);
} else { } else {
sprintf(size_buf, "-"); sprintf(size_buf, "-");
@ -224,8 +229,8 @@ enum status
dirl_footer(int fd, const struct dirl_templ* templ) dirl_footer(int fd, const struct dirl_templ* templ)
{ {
/* Replace placeholder */ /* Replace placeholder */
char* nfoot = calloc(sizeof(char), strlen(templ->footer)+1); char* nfoot = calloc(sizeof(char), strlen(templ->footer) + 1);
memcpy(nfoot, templ->footer, strlen(templ->footer)+1); memcpy(nfoot, templ->footer, strlen(templ->footer) + 1);
/* Write footer */ /* Write footer */
write(fd, nfoot, strlen(nfoot)); write(fd, nfoot, strlen(nfoot));

2
dirl.h
View file

@ -82,7 +82,7 @@ dirl_header(int, const struct response*, const struct dirl_templ*);
/* Print entry into the response */ /* Print entry into the response */
enum status enum status
dirl_entry(int, const struct dirent*, const struct dirl_templ*); dirl_entry(int, const struct dirent*, const struct response*, const struct dirl_templ*);
/* Print footer into the response */ /* Print footer into the response */
enum status enum status