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

Commit 06ebd1af authored by Yi Jin's avatar Yi Jin
Browse files

Fix heap buffer overflow 

Bug: 74000767
Test: manual
Change-Id: Id57674c0ae527da055a06acf4f458c440328c5c3
parent b1d5004c

cmds/incidentd/src/incidentd_util.cpp

+3 −3
Original line number Diff line number Diff line
@@ -94,10 +94,10 @@ const char** varargs(const char* first, va_list rest) { 
    // allocate extra 1 for NULL terminator

    const char** ret = (const char**)malloc(sizeof(const char*) * (numOfArgs + 1));

    ret[0] = first;

    for (int i = 0; i < numOfArgs; i++) {

    for (int i = 1; i < numOfArgs; i++) {

        const char* arg = va_arg(rest, const char*);

        ret[i + 1] = arg;

        ret[i] = arg;

    }

    ret[numOfArgs + 1] = NULL;

    ret[numOfArgs] = NULL;

    return ret;

}