root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-13 01:08:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

dir_scan.c: Fix integer overflow when list of file names in dir exceeds 2GiB

Browse source 
Fixes #150
This commit is contained in:
Yorhel 2020-04-21 14:13:47 +02:00
parent 1563e56223
commit 4a2def5223
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dir_scan.c
View file

@ -118,8 +118,8 @@ static char *dir_read(int *err) {
DIR *dir; DIR *dir;
struct dirent *item; struct dirent *item;
char *buf = NULL; char *buf = NULL;
int buflen = 512; size_t buflen = 512;
int off = 0; size_t off = 0;
if((dir = opendir(".")) == NULL) { if((dir = opendir(".")) == NULL) {
*err = 1; *err = 1;
@ -132,7 +132,7 @@ static char *dir_read(int *err) {
while((item = readdir(dir)) != NULL) { while((item = readdir(dir)) != NULL) {
if(item->d_name[0] == '.' && (item->d_name[1] == 0 || (item->d_name[1] == '.' && item->d_name[2] == 0))) if(item->d_name[0] == '.' && (item->d_name[1] == 0 || (item->d_name[1] == '.' && item->d_name[2] == 0)))
continue; continue;
int req = off+3+strlen(item->d_name); size_t req = off+3+strlen(item->d_name);
if(req > buflen) { if(req > buflen) {
buflen = req < buflen*2 ? buflen*2 : req; buflen = req < buflen*2 ? buflen*2 : req;
buf = xrealloc(buf, buflen); buf = xrealloc(buf, buflen);