commit ad0c2bf5f345a4cdb53a3e4f690db842e8df1685
author Elliott Hughes <enh@google.com> Tue May 24 22:56:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 22:56:38 2016 +0000
tree 9485b52384c07c29d392a868f008b17fb291bd43
parent 0b35da7165e9b78a5e35200bac3df4b2c6bc7c36
parent 1a98776aee4d02c33d922bbbe3ffdd54099840a9

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

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

Change-Id: I1af0d93d03631f257b1372a08aad158508f652ea

toolbox/lsof.c

diff --git a/toolbox/lsof.c b/toolbox/lsof.c
index bee981d..655806d 100644
--- a/toolbox/lsof.c
+++ b/toolbox/lsof.c
@@ -99,10 +99,11 @@
 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));
 
@@ -110,8 +111,8 @@
     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;