Skip to content
Snippets Groups Projects
Commit 5538f8bb authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

resolve merge conflicts of 7f5da850 to lmp-dev am: de529e72 am: 1a98776a...

resolve merge conflicts of 7f5da850 to lmp-dev am: de529e72 am: 1a98776a am: ad0c2bf5 am: a17f2802 am: 20b1e795
am: c443a447

* commit 'c443a447':
  Fix scanf %s in lsof.

Change-Id: Ia66e81641532cf7bca669fb52095aeca90158807
parents 9cb3d3cc c443a447
Branches
Tags
No related merge requests found
......@@ -100,10 +100,11 @@ out:
static void print_maps(struct pid_info_t* info)
{
FILE *maps;
size_t offset;
char device[10];
long int inode;
char file[PATH_MAX];
char file[1024];
strlcat(info->path, "maps", sizeof(info->path));
......@@ -111,8 +112,8 @@ static void print_maps(struct pid_info_t* info)
if (!maps)
goto out;
while (fscanf(maps, "%*x-%*x %*s %zx %s %ld %s\n", &offset, device, &inode,
file) == 4) {
while (fscanf(maps, "%*x-%*x %*s %zx %5s %ld %1023s\n",
&offset, device, &inode, file) == 4) {
// We don't care about non-file maps
if (inode == 0 || !strcmp(device, "00:00"))
continue;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment