ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 71e096c8: Merge "Increase buffer size, use bounds checking functions"

Browse source 
* commit '71e096c894b2b49b0ae63a852c0a8a5a6de0c8a7':
  Increase buffer size, use bounds checking functions
This commit is contained in:
Nick Kralevich 2013-11-27 16:05:24 -08:00 • committed by Android Git Automerger
commit 5e362c871a
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
toolbox/ls.c
View file

@ -75,23 +75,23 @@ static void mode2str(unsigned mode, char *out)
*out = 0; *out = 0;
} }
static void user2str(unsigned uid, char *out) static void user2str(uid_t uid, char *out, size_t out_size)
{ {
struct passwd *pw = getpwuid(uid); struct passwd *pw = getpwuid(uid);
if(pw) { if(pw) {
strcpy(out, pw->pw_name); strlcpy(out, pw->pw_name, out_size);
} else { } else {
sprintf(out, "%d", uid); snprintf(out, out_size, "%d", uid);
} }
} }
static void group2str(unsigned gid, char *out) static void group2str(gid_t gid, char *out, size_t out_size)
{ {
struct group *gr = getgrgid(gid); struct group *gr = getgrgid(gid);
if(gr) { if(gr) {
strcpy(out, gr->gr_name); strlcpy(out, gr->gr_name, out_size);
} else { } else {
sprintf(out, "%d", gid); snprintf(out, out_size, "%d", gid);
} }
} }
@ -164,8 +164,8 @@ static int listfile_long(const char *path, struct stat *s, int flags)
{ {
char date[32]; char date[32];
char mode[16]; char mode[16];
char user[16]; char user[32];
char group[16]; char group[32];
const char *name; const char *name;
if(!s || !path) { if(!s || !path) {
@ -182,11 +182,11 @@ static int listfile_long(const char *path, struct stat *s, int flags)
mode2str(s->st_mode, mode); mode2str(s->st_mode, mode);
if (flags & LIST_LONG_NUMERIC) { if (flags & LIST_LONG_NUMERIC) {
sprintf(user, "%ld", s->st_uid); snprintf(user, sizeof(user), "%ld", s->st_uid);
sprintf(group, "%ld", s->st_gid); snprintf(group, sizeof(group), "%ld", s->st_gid);
} else { } else {
user2str(s->st_uid, user); user2str(s->st_uid, user, sizeof(user));
group2str(s->st_gid, group); group2str(s->st_gid, group, sizeof(group));
} }
strftime(date, 32, "%Y-%m-%d %H:%M", localtime((const time_t*)&s->st_mtime)); strftime(date, 32, "%Y-%m-%d %H:%M", localtime((const time_t*)&s->st_mtime));
@ -238,8 +238,8 @@ static int listfile_long(const char *path, struct stat *s, int flags)
static int listfile_maclabel(const char *path, struct stat *s, int flags) static int listfile_maclabel(const char *path, struct stat *s, int flags)
{ {
char mode[16]; char mode[16];
char user[16]; char user[32];
char group[16]; char group[32];
char *maclabel = NULL; char *maclabel = NULL;
const char *name; const char *name;
@ -261,8 +261,8 @@ static int listfile_maclabel(const char *path, struct stat *s, int flags)
} }
mode2str(s->st_mode, mode); mode2str(s->st_mode, mode);
user2str(s->st_uid, user); user2str(s->st_uid, user, sizeof(user));
group2str(s->st_gid, group); group2str(s->st_gid, group, sizeof(group));
switch(s->st_mode & S_IFMT) { switch(s->st_mode & S_IFMT) {
case S_IFLNK: { case S_IFLNK: {