diff options
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 3 | ||||
| -rw-r--r-- | libs/binder/Parcel.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 7c45c775c7..c6660973f8 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -597,9 +597,8 @@ void IPCThreadState::joinThreadPool(bool isMain) result = getAndExecuteCommand(); if (result < NO_ERROR && result != TIMED_OUT && result != -ECONNREFUSED && result != -EBADF) { - ALOGE("getAndExecuteCommand(fd=%d) returned unexpected error %d, aborting", + LOG_ALWAYS_FATAL("getAndExecuteCommand(fd=%d) returned unexpected error %d, aborting", mProcess->mDriverFD, result); - abort(); } // Let this thread exit the thread pool if it is no longer diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index ee26997912..a6b41e4b5f 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -68,7 +68,7 @@ static size_t pad_size(size_t s) { if (s > (std::numeric_limits<size_t>::max() - 3)) { - abort(); + LOG_ALWAYS_FATAL("pad size too big %zu", s); } return PAD_SIZE_UNSAFE(s); } @@ -295,7 +295,7 @@ size_t Parcel::dataAvail() const { size_t result = dataSize() - dataPosition(); if (result > INT32_MAX) { - abort(); + LOG_ALWAYS_FATAL("result too big: %zu", result); } return result; } @@ -332,7 +332,7 @@ void Parcel::setDataPosition(size_t pos) const if (pos > INT32_MAX) { // don't accept size_t values which may have come from an // inadvertent conversion from a negative int. - abort(); + LOG_ALWAYS_FATAL("pos too big: %zu", pos); } mDataPos = pos; |