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

Commit 90cc4fd6 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 function" 

am: ce07b6fa

Change-Id: Ida2150c0640ff30fc694c6a84c3777eaff906a7c
parents 66181b9b ce07b6fa

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)