Merge "libbinder: Replace abort with LOG_ALWAYS_FATAL" (a4b17161) · Commits · e / os / android_frameworks_native-old

libs/binder/IPCThreadState.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;