From 33f671782a1985b02e4410b923e9688ffd3c1e71 Mon Sep 17 00:00:00 2001 From: Yunlian Jiang Date: Tue, 7 Feb 2017 15:39:25 -0800 Subject: [PATCH] fix warning: Null pointer argument in call to memory comparison function This fixes warning: Null pointer argument in call to memory comparison function [clang-analyzer-cplusplus.NewDeleteLeaks] Bug: None Test: The warning is gone. Change-Id: I957365184966cc1435d7e37d64f2cc6a32846ebd --- libsysutils/src/NetlinkEvent.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index fef801ad0..79bc88853 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -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 */