mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-19 19:40:56 +00:00
Merge pull request #501 from xant/upstream
safety belt : scan_directory() can return without setting arr to a valid value
This commit is contained in:
commit
821e2b3a75
1 file changed
+7
-5
+7
-5
@@ -3640,12 +3640,14 @@ static void send_directory_listing(struct connection *conn, const char *dir) {
|
|||||||
sort_direction, sort_direction, sort_direction);
|
sort_direction, sort_direction, sort_direction);
|
||||||
|
|
||||||
num_entries = scan_directory(conn, dir, &arr);
|
num_entries = scan_directory(conn, dir, &arr);
|
||||||
qsort(arr, num_entries, sizeof(arr[0]), compare_dir_entries);
|
if (arr) {
|
||||||
for (i = 0; i < num_entries; i++) {
|
qsort(arr, num_entries, sizeof(arr[0]), compare_dir_entries);
|
||||||
print_dir_entry(&arr[i]);
|
for (i = 0; i < num_entries; i++) {
|
||||||
NS_FREE(arr[i].file_name);
|
print_dir_entry(&arr[i]);
|
||||||
|
NS_FREE(arr[i].file_name);
|
||||||
|
}
|
||||||
|
NS_FREE(arr);
|
||||||
}
|
}
|
||||||
NS_FREE(arr);
|
|
||||||
|
|
||||||
write_terminating_chunk(conn);
|
write_terminating_chunk(conn);
|
||||||
close_local_endpoint(conn);
|
close_local_endpoint(conn);
|
||||||
|
|||||||
Reference in new issue
Block a user