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"

Browse source
This commit is contained in:
Treehugger Robot 2017-02-09 17:20:13 +00:00 • committed by Gerrit Code Review
commit ce07b6fa4f
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* static const char*
has_prefix(const char* str, const char* end, const char* prefix, size_t prefixlen) 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; return str + prefixlen;
else } else {
return NULL; return NULL;
}
} }
/* Same as strlen(x) for constant string literals ONLY */ /* Same as strlen(x) for constant string literals ONLY */