Merge "Fix build error from signed/unsigned comparison" am: 98c7076202 am: 9f63827322
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2046028 Change-Id: Ib08e4e76b94ca9f2dd923626ad1e0bfc32490d18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
dd79fa2c8d
1 changed files with 1 additions and 1 deletions
|
|
@ -313,7 +313,7 @@ status_t String8::appendFormatV(const char* fmt, va_list args)
|
||||||
|
|
||||||
if (n > 0) {
|
if (n > 0) {
|
||||||
size_t oldLength = length();
|
size_t oldLength = length();
|
||||||
if (n > std::numeric_limits<size_t>::max() - 1 ||
|
if (static_cast<size_t>(n) > std::numeric_limits<size_t>::max() - 1 ||
|
||||||
oldLength > std::numeric_limits<size_t>::max() - n - 1) {
|
oldLength > std::numeric_limits<size_t>::max() - n - 1) {
|
||||||
return NO_MEMORY;
|
return NO_MEMORY;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue