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

Commit f34b03a9 authored by Yunlian Jiang's avatar Yunlian Jiang Committed by android-build-merger
Browse files

Merge "fix warning: Null pointer argument in call to memory comparison... 

Merge "fix warning: Null pointer argument in call to memory comparison function" am: ce07b6fa am: 90cc4fd6
am: 18fa5f75

Change-Id: Ib990ecea8744c4291cb23b9bc0e35601d02ec869
parents 3e1c5485 18fa5f75

libsysutils/src/NetlinkEvent.cpp

+4 −2
Original line number Diff line number Diff line
@@ -561,11 +561,13 @@ bool NetlinkEvent::parseBinaryNetlinkMessage(char *buffer, int size) { 
static const char*

has_prefix(const char* str, const char* end, const char* prefix, size_t prefixlen)

{

    if ((end-str) >= (ptrdiff_t)prefixlen && !memcmp(str, prefix, prefixlen))

    if ((end - str) >= (ptrdiff_t)prefixlen &&

        (prefixlen == 0 || !memcmp(str, prefix, prefixlen))) {

        return str + prefixlen;

    else

    } else {

        return NULL;

    }

}



/* Same as strlen(x) for constant string literals ONLY */

#define CONST_STRLEN(x)  (sizeof(x)-1)