From 80ec37aa15c138beee5889a257d1241c30a1e8d7 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Wed, 14 Jul 2010 14:00:41 +0800 Subject: [PATCH] libsysutils: reimplement NetlinkEvent::findParam in the proper way The original implementation can not find correct parameters for certain cases. For example, if you have both foo_bar and foo, try to find foo may be mismatched. The correct way is to match with "=". Change-Id: I403b1a7b889583a57a4f3a14e575181ce93b10ff --- libsysutils/src/NetlinkEvent.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index c2ba64779..86c1f4280 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -93,13 +93,11 @@ bool NetlinkEvent::decode(char *buffer, int size) { } const char *NetlinkEvent::findParam(const char *paramName) { - int i; - - for (i = 0; i < NL_PARAMS_MAX; i++) { - if (!mParams[i]) - break; - if (!strncmp(mParams[i], paramName, strlen(paramName))) - return &mParams[i][strlen(paramName) + 1]; + size_t len = strlen(paramName); + for (int i = 0; mParams[i] && i < NL_PARAMS_MAX; ++i) { + const char *ptr = mParams[i] + len; + if (!strncmp(mParams[i], paramName, len) && *ptr == '=') + return ++ptr; } SLOGE("NetlinkEvent::FindParam(): Parameter '%s' not found", paramName);