Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4a72b306: Merge "fix possible buffer overrun and memory leak"

Browse Source 
* commit '4a72b3064cecc85c56b8d75bb4a2d9fedbf76ec8':
  fix possible buffer overrun and memory leak
This commit is contained in:
Elliott Hughes
2013-12-10 17:35:25 -08:00
committed by Android Git Automerger
parent f70d7b9ace 4a72b3064c
commit 5b9437df99
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_util_Binder.cpp
View File

@@ -943,13 +943,20 @@ static jboolean android_os_BinderProxy_isBinderAlive(JNIEnv* env, jobject obj)
} }
static int getprocname(pid_t pid, char *buf, size_t len) { static int getprocname(pid_t pid, char *buf, size_t len) {
char filename[20]; char filename[32];
FILE *f; FILE *f;
sprintf(filename, "/proc/%d/cmdline", pid); snprintf(filename, sizeof(filename), "/proc/%d/cmdline", pid);
f = fopen(filename, "r"); f = fopen(filename, "r");
if (!f) { *buf = '\0'; return 1; } if (!f) {
if (!fgets(buf, len, f)) { *buf = '\0'; return 2; } *buf = '\0';
return 1;
}
if (!fgets(buf, len, f)) {
*buf = '\0';
fclose(f);
return 2;
}
fclose(f); fclose(f);
return 0; return 0;
} }