Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils: Prevent stack buffer leaks by safely trapping snprintf error bounds in Systrace

Browse Source
This commit is contained in:
Mathias Agopian
2026-03-30 17:36:39 -07:00
committed by Mathias Agopian
parent 6713c68791
commit 883f5bae4e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/utils/src/android/Systrace.cpp
View File

@@ -186,16 +186,20 @@ void Systrace::init(uint32_t tag) noexcept {
len = snprintf(buf, sizeof(buf), format_begin "%.*s" format_end, pid, \
name_len, name, value); \
} \
write(fd, buf, len); \
if (len >= 0) { \
write(fd, buf, len); \
} \
}
void Systrace::begin_body(int fd, int pid, const char* name) noexcept {
char buf[ATRACE_MESSAGE_LENGTH];
ssize_t len = snprintf(buf, sizeof(buf), "B|%d|%s", pid, name);
if (len >= sizeof(buf)) {
len = sizeof(buf) - 1;
if (len >= 0) {
if (len >= sizeof(buf)) {
len = sizeof(buf) - 1;
}
write(fd, buf, size_t(len));
}
write(fd, buf, size_t(len));
}
void Systrace::end_body(int fd, int pid) noexcept {