kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Fix ls realloc loop.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2016-01-08 00:47:14 +01:00
parent 8b52c0d818
commit f3e3c98084
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils/ls.cpp
View file

@ -403,8 +403,8 @@ int ls(const char* path)
{
size_t newentrieslen = entrieslen * 2UL;
struct dirent** newentries;
size_t newentriessize = sizeof(struct dirent*) * newentrieslen;
newentries = (struct dirent**) realloc(entries, newentriessize);
entriessize = sizeof(struct dirent*) * newentrieslen;
newentries = (struct dirent**) realloc(entries, entriessize);
if ( !newentries )
{
ls_error(0, errno, "realloc");
@ -412,7 +412,6 @@ int ls(const char* path)
}
entries = newentries;
entrieslen = newentrieslen;
entriessize = newentriessize;
}
struct dirent* copy = dirent_dup(entry);
if ( !copy )
@ -423,7 +422,7 @@ int ls(const char* path)
entries[entriesused++] = copy;
}
#if defined(sortix)
#if defined(__sortix__)
if ( derror(dir) )
{
ls_error(0, errno, path);