From: Rob Landley Date: Tue, 23 Jun 2015 18:56:53 +0000 (-0500) Subject: Don't segfault if none of the file arguments to ls exists. X-Git-Tag: android-x86-6.0-r1~58^2~153 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9acbbafefafbbb7b13bb15c1619e351f9b67a23d;p=android-x86%2Fexternal-toybox.git Don't segfault if none of the file arguments to ls exists. --- diff --git a/toys/posix/ls.c b/toys/posix/ls.c index bba34313..44915fa7 100644 --- a/toys/posix/ls.c +++ b/toys/posix/ls.c @@ -298,7 +298,8 @@ static void listfiles(int dirfd, struct dirtree *indir) // Silently descend into single directory listed by itself on command line. // In this case only show dirname/total header when given -R. dt = indir->child; - if (S_ISDIR(dt->st.st_mode) && !dt->next && !(flags&(FLAG_d|FLAG_R))) { + if (dt && S_ISDIR(dt->st.st_mode) && !dt->next && !(flags&(FLAG_d|FLAG_R))) + { listfiles(open(dt->name, 0), TT.singledir = dt); return;