summaryrefslogtreecommitdiff
path: root/libutils/String8.cpp
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2020-07-28 21:41:54 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-08-12 21:45:05 +0000
commitbad50ed24f9d48d001fcedd332d59f162dc3432d (patch)
tree1443e8741df9aa77cb6410d23f52c97df24fe96b /libutils/String8.cpp
parent6072de17cd812daf238092695f26a552d3122f8c (diff)
libutils: check vsnprintf error
For encoding errors, this function will return a negative value which causes problems down the line. Check for an error and return. Also, integer overflows are guarded. Bug: 161894517 Test: fuzzer test case Change-Id: Ia85067d4258bde4b875c832d6223db5dd26b8838 Merged-In: Ia85067d4258bde4b875c832d6223db5dd26b8838 (cherry picked from commit ee22384c54d42149491c8b9dbcda0d8c5e88eddc)
Diffstat (limited to 'libutils/String8.cpp')
-rw-r--r--libutils/String8.cpp8
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);