playground/suckless-quark
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix memleak in scandir()

Browse source
This commit is contained in:
Hiltjo Posthuma 2017-06-27 22:24:43 +02:00 committed by Laslo Hunhold
parent d1589c96fa
commit b6559eb3e7
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
quark.c
View file

@ -342,7 +342,7 @@ senddir(int fd, char *name, struct request *r)
{ {
struct dirent **e; struct dirent **e;
size_t i; size_t i;
int dirlen; int dirlen, s;
static char t[TIMESTAMP_LEN]; static char t[TIMESTAMP_LEN];
/* read directory */ /* read directory */
@ -358,7 +358,8 @@ senddir(int fd, char *name, struct request *r)
"Content-Type: text/html\r\n" "Content-Type: text/html\r\n"
"\r\n", "\r\n",
S_OK, status_str[S_OK], timestamp(0, t)) < 0) { S_OK, status_str[S_OK], timestamp(0, t)) < 0) {
return S_REQUEST_TIMEOUT; s = S_REQUEST_TIMEOUT;
goto cleanup;
} }
if (r->method == M_GET) { if (r->method == M_GET) {
@ -368,7 +369,8 @@ senddir(int fd, char *name, struct request *r)
"<title>Index of %s</title></head>\n" "<title>Index of %s</title></head>\n"
"\t<body>\n\t\t<a href=\"..\">..</a>", "\t<body>\n\t\t<a href=\"..\">..</a>",
name) < 0) { name) < 0) {
return S_REQUEST_TIMEOUT; s = S_REQUEST_TIMEOUT;
goto cleanup;
} }
/* listing */ /* listing */
@ -381,17 +383,25 @@ senddir(int fd, char *name, struct request *r)
/* entry line */ /* entry line */
if (dprintf(fd, "<br />\n\t\t<a href=\"%s\">%s%s</a>", if (dprintf(fd, "<br />\n\t\t<a href=\"%s\">%s%s</a>",
e[i]->d_name, e[i]->d_name, filetype(e[i]->d_type)) < 0) { e[i]->d_name, e[i]->d_name, filetype(e[i]->d_type)) < 0) {
return S_REQUEST_TIMEOUT; s = S_REQUEST_TIMEOUT;
goto cleanup;
} }
} }
/* listing footer */ /* listing footer */
if (dprintf(fd, "\n\t</body>\n</html>\n") < 0) { if (dprintf(fd, "\n\t</body>\n</html>\n") < 0) {
return S_REQUEST_TIMEOUT; s = S_REQUEST_TIMEOUT;
goto cleanup;
} }
} }
s = S_OK;
return S_OK; cleanup:
while (dirlen--)
free(e[dirlen]);
free(e);
return s;
} }
static enum status static enum status