Skip to content

Fix buffer overflow in Android LogException via std::string concatenation #1950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AustinBenoit merged 3 commits into from
Oct 27, 2026
+10 −8
Merged

Fix buffer overflow in Android LogException via std::string concatenation #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2416247
Fix buffer overflow in Android LogException via std::string concatena…
AustinBenoit Oct 26, 2026
c36f4a4
Zero-initialize stack buffer in LogException
AustinBenoit Oct 26, 2026
58b8a4f
Merge branch 'main' into fix/android-log-exception-strncat
AustinBenoit Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions app/src/util_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,18 +1882,15 @@ bool LogException(JNIEnv* env, LogLevel log_level, const char* log_fmt, ...) {
}
if (message) {
std::string message_str = JniStringToString(env, message);
if (log_fmt == nullptr) {
LogMessage(log_level, "%s", message_str.c_str());
} else {
static char buf[512];
if (log_fmt != nullptr) {
char buf[512] = {0};
va_list list;
va_start(list, log_fmt);
vsnprintf(buf, sizeof(buf) - 1, log_fmt, list);
vsnprintf(buf, sizeof(buf), log_fmt, list);
va_end(list);
strncat(buf, ": ", sizeof(buf) - 1);
strncat(buf, message_str.c_str(), sizeof(buf) - 1);
LogMessage(log_level, "%s", buf);
message_str = std::string(buf) + ": " + message_str;
}
LogMessage(log_level, "%s", message_str.c_str());
}
env->DeleteLocalRef(exception);
return true;
Expand Down
5 changes: 5 additions & 0 deletions release_build_files/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,11 @@ workflow use only during the development of your app, not for publicly shipping
code.

## Release Notes
### Upcoming
- Changes
- General (Android): Fixed a potential buffer overflow in `LogException` when
formatting long JNI exception messages.

### 14.1.0
- Changes
- General (Android): Update to Firebase Android BoM version 35.1.0.
Expand Down
Loading