From a7984d970a88a19ce3e03694fb5b98dfb1ca9735 Mon Sep 17 00:00:00 2001 From: tobitege Date: Thu, 23 Apr 2015 08:01:33 +0200 Subject: [PATCH 1/2] findParam: don't check empty param name Change-Id: Ie02bf706c1c0899dc2584b365894a1b6ce9caa8d --- libsysutils/src/NetlinkEvent.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index 9d596ef55fb..72bf4239288 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -597,6 +597,9 @@ bool NetlinkEvent::decode(char *buffer, int size, int format) { const char *NetlinkEvent::findParam(const char *paramName) { size_t len = strlen(paramName); + if (len == 0) { + return NULL; + } for (int i = 0; i < NL_PARAMS_MAX && mParams[i] != NULL; ++i) { const char *ptr = mParams[i] + len; if (!strncmp(mParams[i], paramName, len) && *ptr == '=') From 985287bfb15fef12cf90cd68c8b7206c3061bded Mon Sep 17 00:00:00 2001 From: quanganh2627 Date: Wed, 15 Apr 2015 02:15:13 +0700 Subject: [PATCH 2/2] Rename libext2_uuid -> libext2_uuid_static lib Change-Id: I2dd416558321c424bca97efa973ee5a68b742a64 --- fs_mgr/Android.mk | 4 ++-- init/Android.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index e1d20299f91..b004f6e45f1 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= fs_mgr.c fs_mgr_verity.c fs_mgr_fstab.c LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_MODULE:= libfs_mgr -LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static libext2_blkid libext2_uuid +LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static libext2_blkid libext2_uuid_static LOCAL_C_INCLUDES += system/extras/ext4_utils external/e2fsprogs/lib LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_CFLAGS := -Werror @@ -34,7 +34,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED) -LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static libext2_blkid libext2_uuid +LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static libext2_blkid libext2_uuid_static LOCAL_CFLAGS := -Werror diff --git a/init/Android.mk b/init/Android.mk index db000c22a81..61ae6c25b2b 100755 --- a/init/Android.mk +++ b/init/Android.mk @@ -62,7 +62,7 @@ LOCAL_STATIC_LIBRARIES := \ libmincrypt \ libext4_utils_static \ libext2_blkid \ - libext2_uuid + libext2_uuid_static LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk ifneq ($(strip $(TARGET_PLATFORM_DEVICE_BASE)),)