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

Commit 4a72b306 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "fix possible buffer overrun and memory leak"

parents bea98dc2 ec3d44cc

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;

}