diff options
| author | Steven Moreland <smoreland@google.com> | 2020-08-04 23:19:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-04 23:19:46 +0000 |
| commit | ce44c8ac3caebe5b5a34954643bf48be186bc783 (patch) | |
| tree | 1443e8741df9aa77cb6410d23f52c97df24fe96b | |
| parent | 6d76455283ef9ae6a54a4c7aa098a0471e40a2d3 (diff) | |
| parent | 0cb14f1fe7b1f63de2d697797a1e101724f7be40 (diff) | |
| download | core-ce44c8ac3caebe5b5a34954643bf48be186bc783.tar.gz | |
Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d542 am: d8801aaad8 am: d05ecb8d9d am: dc99a094dd am: 64b312bbd8 am: 0cb14f1fe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459
Change-Id: I1cb83a4a22e205dddd10536f61392215d5cb33dc
| -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 d13548e4c..9d50e0bc5 100644 --- a/libutils/String8.cpp +++ b/libutils/String8.cpp @@ -322,8 +322,14 @@ status_t String8::appendFormatV(const char* fmt, va_list args) n = vsnprintf(nullptr, 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); |