Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3dd83c6 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '5b9437df':
  fix possible buffer overrun and memory leak
parents aec930b2 5b9437df

core/jni/android_util_Binder.cpp

+11 −4
Original line number Diff line number Diff line
@@ -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) {

    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;

}