diff options
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; |