diff options
| author | Steven Moreland <smoreland@google.com> | 2020-08-04 21:37:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-04 21:37:54 +0000 |
| commit | d8801aaad8683374298bc119480a292978dda680 (patch) | |
| tree | 197fd9bb4360c52b8e18f57dad0741ae5754333d | |
| parent | cf9115136425c98994fc2c607f954156917e6c25 (diff) | |
| parent | a03d37d542028e7cfaa3ad2ac44f7879a8297777 (diff) | |
| download | core-d8801aaad8683374298bc119480a292978dda680.tar.gz | |
Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459
Change-Id: Id247c7079c146da8eaf52f098027d5daa25ce8d8
| -rw-r--r-- | libutils/String8.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libutils/String8.cpp b/libutils/String8.cpp index ad0e72ec1..8f9c9f723 100644 --- a/libutils/String8.cpp +++ b/libutils/String8.cpp @@ -346,8 +346,14 @@ status_t String8::appendFormatV(const char* fmt, va_list args) n = vsnprintf(NULL, 0, fmt, tmp_args); va_end(tmp_args); - if (n != 0) { + if (n < 0) return UNKNOWN_ERROR; + + if (n > 0) { size_t oldLength = length(); + if ((size_t)n > SIZE_MAX - 1 || + oldLength > SIZE_MAX - (size_t)n - 1) { + return NO_MEMORY; + } char* buf = lockBuffer(oldLength + n); if (buf) { vsnprintf(buf + oldLength, n + 1, fmt, args); |