3party/mongoose
0
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-01-15 02:08:08 +08:00
Code Issues Projects Releases Wiki Activity

Fixed wrong memset() in scan_directory()

Browse Source
This commit is contained in:
Sergey Lyubka 2013-12-15 10:12:19 +00:00
parent f5865886b2
commit 9ef42621e0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mongoose.c
View File

@ -1858,9 +1858,10 @@ static int scan_directory(struct connection *conn, const char *dir,
char path[MAX_PATH_SIZE]; char path[MAX_PATH_SIZE];
struct dir_entry *p; struct dir_entry *p;
struct dirent *dp; struct dirent *dp;
int arr_size = 0, arr_ind = 0; int arr_size = 0, arr_ind = 0, inc = 100;
DIR *dirp; DIR *dirp;
*arr = NULL;
if ((dirp = (opendir(dir))) == NULL) return 0; if ((dirp = (opendir(dir))) == NULL) return 0;
while ((dp = readdir(dirp)) != NULL) { while ((dp = readdir(dirp)) != NULL) {
@ -1873,16 +1874,16 @@ static int scan_directory(struct connection *conn, const char *dir,
mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name); mg_snprintf(path, sizeof(path), "%s%c%s", dir, '/', dp->d_name);
// Resize the array if nesessary // Resize the array if nesessary
if (arr_ind >= arr_size - 1) { if (arr_ind >= arr_size) {
if ((p = (struct dir_entry *) if ((p = (struct dir_entry *)
realloc(*arr, (100 + arr_size) * sizeof(**arr))) != NULL) { realloc(*arr, (inc + arr_size) * sizeof(**arr))) != NULL) {
// Memset struct to zero, otherwize st_mtime will have garbage which // Memset new chunk to zero, otherwize st_mtime will have garbage which
// can make strftime() segfault, see // can make strftime() segfault, see
// http://code.google.com/p/mongoose/issues/detail?id=79 // http://code.google.com/p/mongoose/issues/detail?id=79
memset(p + arr_size, 0, sizeof(**arr) * arr_size); memset(p + arr_size, 0, sizeof(**arr) * inc);
*arr = p; *arr = p;
arr_size += 100; arr_size += inc;
} }
} }