commit 8be3b6eff344318f2ba2380896e0b248edfbf886
author Elliott Hughes <enh@google.com> Tue May 24 23:11:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 23:11:36 2016 +0000
tree 369b5ec5671d72118682520a103cfe94e526e3b9
parent cbcb81a5228aaf414a604c061500abe7e3c7fc66
parent 2c9dac63c5c7bec5b2f59fcc5ead4ddcd0e992f2

resolve merge conflicts of 7f5da85 to lmp-dev am: de529e72b6 am: 1a98776aee am: ad0c2bf5f3 am: a17f2802b1 am: 20b1e79563 am: c443a447b2
am: 5538f8bb63

* commit '5538f8bb63c79d1b9de6e809e085bd78b1027f9c':
  Fix scanf %s in lsof.

Change-Id: I09d37fb2798e6038bb00fb8e210b9d3c5348a4e4

toolbox/lsof.c

diff --git a/toolbox/lsof.c b/toolbox/lsof.c
index 982f5aa..da78ddd 100644
--- a/toolbox/lsof.c
+++ b/toolbox/lsof.c
@@ -100,10 +100,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));
 
@@ -111,8 +112,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;