| commit | 88cb3736cd0f7978025aa83db8001b98393a65db | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Mon Aug 10 19:10:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 10 19:10:40 2020 +0000 |
| tree | 3a76d8a6e19a6fb7d05dbd7d3cf8d9ae4933f7e0 | |
| parent | 1da481a21ea9e3ea9488d4f141139299b7ff8896 [diff] | |
| parent | ac33ba71b306ceec1a3df80ab7998cbfd31cc8c9 [diff] |
libsnapshot_test: skip global setup on non-VAB devices. am: b085db746a Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12329326 Change-Id: I9c273068441327d893d84e48fbec4df3189833c3
diff --git a/libutils/String8.cpp b/libutils/String8.cpp index d13548e..9d50e0b 100644 --- a/libutils/String8.cpp +++ b/libutils/String8.cpp
@@ -322,8 +322,14 @@ 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);