999089181e
Move dlmalloc code to upstream-dlmalloc to make pulling upstream changes easier. Declare pvalloc and malloc_usable_size routines present in malloc.h but with missing implementations. Remove other functions from malloc.h that have no implementation nor use in Android. Change-Id: Ia6472ec6cbebc9ad1ef99f4669de9d33fcc2efb4
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
/*
|
|
* Copyright (C) 2012 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.
|
|
*/
|
|
|
|
#include "dlmalloc.h"
|
|
|
|
/* Bionic error handling declarations */
|
|
#define PROCEED_ON_ERROR 0
|
|
static void __bionic_heap_error(const char* msg, const char* function, void* p);
|
|
#define CORRUPTION_ERROR_ACTION(m) \
|
|
__bionic_heap_error("HEAP MEMORY CORRUPTION", __FUNCTION__, NULL)
|
|
#define USAGE_ERROR_ACTION(m,p) \
|
|
__bionic_heap_error("ARGUMENT IS INVALID HEAP ADDRESS", __FUNCTION__, p)
|
|
|
|
/*
|
|
* Ugly inclusion of C file so that bionic specific #defines configure
|
|
* dlmalloc.
|
|
*/
|
|
#include "../upstream-dlmalloc/malloc.c"
|
|
|
|
|
|
/* Bionic error handling definitions */
|
|
/* Convert a pointer into hex string */
|
|
static void __bionic_itox(char* hex, void* ptr)
|
|
{
|
|
intptr_t val = (intptr_t) ptr;
|
|
/* Terminate with NULL */
|
|
hex[8] = 0;
|
|
int i;
|
|
|
|
for (i = 7; i >= 0; i--) {
|
|
int digit = val & 15;
|
|
hex[i] = (digit <= 9) ? digit + '0' : digit - 10 + 'a';
|
|
val >>= 4;
|
|
}
|
|
}
|
|
|
|
#include <private/logd.h>
|
|
static void __bionic_heap_error(const char* msg, const char* function, void* p)
|
|
{
|
|
/* We format the buffer explicitely, i.e. without using snprintf()
|
|
* which may use malloc() internally. Not something we can trust
|
|
* if we just detected a corrupted heap.
|
|
*/
|
|
char buffer[256];
|
|
strlcpy(buffer, "@@@ ABORTING: LIBC: ", sizeof(buffer));
|
|
strlcat(buffer, msg, sizeof(buffer));
|
|
if (function != NULL) {
|
|
strlcat(buffer, " IN ", sizeof(buffer));
|
|
strlcat(buffer, function, sizeof(buffer));
|
|
}
|
|
|
|
if (p != NULL) {
|
|
char hexbuffer[9];
|
|
__bionic_itox(hexbuffer, p);
|
|
strlcat(buffer, " addr=0x", sizeof(buffer));
|
|
strlcat(buffer, hexbuffer, sizeof(buffer));
|
|
}
|
|
|
|
__libc_android_log_write(ANDROID_LOG_FATAL, "libc", buffer);
|
|
|
|
/* So that we can get a memory dump around p */
|
|
*((int **) 0xdeadbaad) = (int *) p;
|
|
}
|