d3c8d5b8d4
A normal sequence of calls is as follows: str_parms_create_str, str_parms_add_str, str_parms_destroy. In some cases the destroy caused double free. str_parms_add_str will clone the input and send it to hashmapPut for storage. If hashmapPut did not store the strings it will raise errno = ENOMEM and leave caller with ownership of the strings. In any of these cases it will be safe to destroy the str_parms. But what if it wasn't hashmapPut that said NOMEM? What if there was a stale NOMEM already before a successful hashmapPut? In that case the strings will be successfully added to the list (if new), but when str_parms_add_str sees the NOMEM it will free them anyway, leaving dangling pointers in the str_parms!! It is the responsibility of the caller to clear errno before any interesting call. This patch makes sure that str_parms_add_str reacts only on errno emmitted from hashmapPut. Change-Id: If87e4bcc482f09e1c66133d33517b152ebdac65f
159 lines
4.4 KiB
Makefile
159 lines
4.4 KiB
Makefile
#
|
|
# Copyright (C) 2008 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
LOCAL_PATH := $(my-dir)
|
|
include $(CLEAR_VARS)
|
|
|
|
ifeq ($(TARGET_CPU_SMP),true)
|
|
targetSmpFlag := -DANDROID_SMP=1
|
|
else
|
|
targetSmpFlag := -DANDROID_SMP=0
|
|
endif
|
|
hostSmpFlag := -DANDROID_SMP=0
|
|
|
|
commonSources := \
|
|
hashmap.c \
|
|
atomic.c.arm \
|
|
native_handle.c \
|
|
socket_inaddr_any_server.c \
|
|
socket_local_client.c \
|
|
socket_local_server.c \
|
|
socket_loopback_client.c \
|
|
socket_loopback_server.c \
|
|
socket_network_client.c \
|
|
sockets.c \
|
|
config_utils.c \
|
|
cpu_info.c \
|
|
load_file.c \
|
|
open_memstream.c \
|
|
strdup16to8.c \
|
|
strdup8to16.c \
|
|
record_stream.c \
|
|
process_name.c \
|
|
threads.c \
|
|
sched_policy.c \
|
|
iosched_policy.c \
|
|
str_parms.c \
|
|
|
|
commonHostSources := \
|
|
ashmem-host.c
|
|
|
|
# some files must not be compiled when building against Mingw
|
|
# they correspond to features not used by our host development tools
|
|
# which are also hard or even impossible to port to native Win32
|
|
WINDOWS_HOST_ONLY :=
|
|
ifeq ($(HOST_OS),windows)
|
|
ifeq ($(strip $(USE_CYGWIN)),)
|
|
WINDOWS_HOST_ONLY := 1
|
|
endif
|
|
endif
|
|
# USE_MINGW is defined when we build against Mingw on Linux
|
|
ifneq ($(strip $(USE_MINGW)),)
|
|
WINDOWS_HOST_ONLY := 1
|
|
endif
|
|
|
|
ifneq ($(WINDOWS_HOST_ONLY),1)
|
|
commonSources += \
|
|
fs.c \
|
|
multiuser.c
|
|
endif
|
|
|
|
|
|
# Static library for host
|
|
# ========================================================
|
|
LOCAL_MODULE := libcutils
|
|
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
|
|
LOCAL_LDLIBS := -lpthread
|
|
LOCAL_STATIC_LIBRARIES := liblog
|
|
LOCAL_CFLAGS += $(hostSmpFlag)
|
|
include $(BUILD_HOST_STATIC_LIBRARY)
|
|
|
|
|
|
# Static library for host, 64-bit
|
|
# ========================================================
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := lib64cutils
|
|
LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) dlmalloc_stubs.c
|
|
LOCAL_LDLIBS := -lpthread
|
|
LOCAL_STATIC_LIBRARIES := lib64log
|
|
LOCAL_CFLAGS += $(hostSmpFlag) -m64
|
|
include $(BUILD_HOST_STATIC_LIBRARY)
|
|
|
|
# Tests for host
|
|
# ========================================================
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := tst_str_parms
|
|
LOCAL_CFLAGS += -DTEST_STR_PARMS
|
|
LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c
|
|
LOCAL_STATIC_LIBRARIES := liblog
|
|
LOCAL_MODULE_TAGS := optional
|
|
include $(BUILD_HOST_EXECUTABLE)
|
|
|
|
|
|
# Shared and static library for target
|
|
# ========================================================
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := libcutils
|
|
LOCAL_SRC_FILES := $(commonSources) \
|
|
android_reboot.c \
|
|
ashmem-dev.c \
|
|
debugger.c \
|
|
klog.c \
|
|
partition_utils.c \
|
|
properties.c \
|
|
qtaguid.c \
|
|
trace.c \
|
|
uevent.c
|
|
|
|
ifeq ($(TARGET_ARCH),arm)
|
|
LOCAL_SRC_FILES += arch-arm/memset32.S
|
|
else # !arm
|
|
ifeq ($(TARGET_ARCH),x86)
|
|
LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32
|
|
LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
|
|
else # !x86
|
|
ifeq ($(TARGET_ARCH),mips)
|
|
LOCAL_SRC_FILES += arch-mips/android_memset.c
|
|
else # !mips
|
|
LOCAL_SRC_FILES += memory.c
|
|
endif # !mips
|
|
endif # !x86
|
|
endif # !arm
|
|
|
|
LOCAL_C_INCLUDES := $(libcutils_c_includes)
|
|
LOCAL_STATIC_LIBRARIES := liblog
|
|
LOCAL_CFLAGS += $(targetSmpFlag)
|
|
include $(BUILD_STATIC_LIBRARY)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := libcutils
|
|
# TODO: remove liblog as whole static library, once we don't have prebuilt that requires
|
|
# liblog symbols present in libcutils.
|
|
LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog
|
|
LOCAL_SHARED_LIBRARIES := liblog
|
|
LOCAL_CFLAGS += $(targetSmpFlag)
|
|
LOCAL_C_INCLUDES := $(libcutils_c_includes)
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|
|
include $(CLEAR_VARS)
|
|
LOCAL_MODULE := tst_str_parms
|
|
LOCAL_CFLAGS += -DTEST_STR_PARMS
|
|
LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c
|
|
LOCAL_SHARED_LIBRARIES := liblog
|
|
LOCAL_MODULE_TAGS := optional
|
|
include $(BUILD_EXECUTABLE)
|
|
|
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|