ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fix warning: Null pointer argument in call to memory comparison function" am: ce07b6fa4f

Browse source 
am: 90cc4fd6a4

Change-Id: I13c4bd4dc53f29b5cd0f073909fb54c9107142c7
This commit is contained in:
Yunlian Jiang 2017-02-09 17:26:06 +00:00 • committed by android-build-merger
commit 18fa5f7558
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libsysutils/src/NetlinkEvent.cpp
View file

@ -561,10 +561,12 @@ 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 */