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

resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6

Browse source 
am: 1a98776aee

* commit '1a98776aee4d02c33d922bbbe3ffdd54099840a9':
  Fix scanf %s in lsof.

Change-Id: I1af0d93d03631f257b1372a08aad158508f652ea
This commit is contained in:
Elliott Hughes 2016-05-24 22:56:38 +00:00 • committed by android-build-merger
commit ad0c2bf5f3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toolbox/lsof.c
View file

@ -99,10 +99,11 @@ out:
static void print_maps(struct pid_info_t* info) static void print_maps(struct pid_info_t* info)
{ {
FILE *maps; FILE *maps;
size_t offset; size_t offset;
char device[10]; char device[10];
long int inode; long int inode;
char file[PATH_MAX]; char file[1024];
strlcat(info->path, "maps", sizeof(info->path)); strlcat(info->path, "maps", sizeof(info->path));
@ -110,8 +111,8 @@ static void print_maps(struct pid_info_t* info)
if (!maps) if (!maps)
goto out; goto out;
while (fscanf(maps, "%*x-%*x %*s %zx %s %ld %s\n", &offset, device, &inode, while (fscanf(maps, "%*x-%*x %*s %zx %5s %ld %1023s\n",
file) == 4) { &offset, device, &inode, file) == 4) {
// We don't care about non-file maps // We don't care about non-file maps
if (inode == 0 || !strcmp(device, "00:00")) if (inode == 0 || !strcmp(device, "00:00"))
continue; continue;