commit 4b3cc6e83c09214a030ee587f35e65531830c8ee
author Colin Cross <ccross@google.com> Fri Apr 24 22:42:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 24 22:42:36 2015 +0000
tree cc4c64af5f0056b97363b2e39a7063fb7fc8f3ca
parent e2c9cfd9de1398a49a0ec3a14a44aed25439b878
parent 7117efced82fcb4d3658161d765bfc964ab930f4

am 7117efce: Merge "fix possible buffer overrun in librank"

* commit '7117efced82fcb4d3658161d765bfc964ab930f4':
  fix possible buffer overrun in librank

librank/librank.c

diff --git a/librank/librank.c b/librank/librank.c
index 2e3c3fc..28322b9 100644
--- a/librank/librank.c
+++ b/librank/librank.c
@@ -443,13 +443,20 @@
 }
 
 static int getprocname(pid_t pid, char *buf, size_t len) {
-    char filename[20];
+    char filename[32];
     FILE *f;
 
-    sprintf(filename, "/proc/%d/cmdline", pid);
+    snprintf(filename, sizeof(filename), "/proc/%d/cmdline", pid);
     f = fopen(filename, "r");
-    if (!f) { *buf = '\0'; return 1; }
-    if (!fgets(buf, len, f)) { *buf = '\0'; return 2; }
+    if (!f) {
+        *buf = '\0';
+        return 1;
+    }
+    if (!fgets(buf, len, f)) {
+        *buf = '\0';
+        fclose(f);
+        return 2;
+    }
     fclose(f);
     return 0;
 }