diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-03 15:33:05 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-03 15:33:05 -0700 |
| commit | f450fa5f991af3c0814f96265cb3b2aafdce2309 (patch) | |
| tree | 1f0e549863606fb8e11215061ad5dde0f37b50cd /libc/bionic | |
| parent | 5ef5272be985dfdeafa86077c306f6b64d334240 (diff) | |
| parent | 0be7eda75a14815aaa3e5cd5d5d4e5d25dc35d1c (diff) | |
| download | bionic-f450fa5f991af3c0814f96265cb3b2aafdce2309.zip bionic-f450fa5f991af3c0814f96265cb3b2aafdce2309.tar.gz bionic-f450fa5f991af3c0814f96265cb3b2aafdce2309.tar.bz2 | |
merge from open-source master
Change-Id: If02d33af51017dbd85e91c79ac2e848eda6cf253
Diffstat (limited to 'libc/bionic')
| -rw-r--r-- | libc/bionic/logd_write.c | 2 | ||||
| -rw-r--r-- | libc/bionic/malloc_debug_leak.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libc/bionic/logd_write.c b/libc/bionic/logd_write.c index 2c5bf42..618160f 100644 --- a/libc/bionic/logd_write.c +++ b/libc/bionic/logd_write.c @@ -114,6 +114,8 @@ static int __write_to_log_init(log_id_t log_id, struct iovec *vec) (fd < 0) ? __write_to_log_null : __write_to_log_kernel; log_channels[log_id].fd = fd; + log_channels[log_id].fd = fd; + pthread_mutex_unlock(&log_init_lock); return log_channels[log_id].logger(log_id, vec); diff --git a/libc/bionic/malloc_debug_leak.c b/libc/bionic/malloc_debug_leak.c index 2ff8cee..0a3a68d 100644 --- a/libc/bionic/malloc_debug_leak.c +++ b/libc/bionic/malloc_debug_leak.c @@ -149,6 +149,8 @@ static HashEntry* record_backtrace(intptr_t* backtrace, size_t numEntries, size_ } else { // create a new entry entry = (HashEntry*)dlmalloc(sizeof(HashEntry) + numEntries*sizeof(intptr_t)); + if (!entry) + return NULL; entry->allocations = 1; entry->slot = slot; entry->prev = NULL; |