Skip to content

Fixed exception propagation on null default uncaught exception handler #6280

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
merged 1 commit into from
Sep 20, 2024
Merged

Fixed exception propagation on null default uncaught exception handler #6280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions firebase-crashlytics/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Unreleased
* [fixed] Improved data consistency for rapid user actions.
* [fixed] Fixed exception propagation in the case of no default uncaught exception handler.
* [changed] Internal changes to improve startup time.
* [changed] Internal changes to the way background tasks are scheduled.
* [changed] Migrated SDK to use standard Firebase executors.
Expand Down
9 changes: 7 additions & 2 deletions .../com/google/firebase/crashlytics/internal/common/CrashlyticsUncaughtExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,13 @@ public void uncaughtException(Thread thread, Throwable ex) {
} catch (Exception e) {
Logger.getLogger().e("An error occurred in the uncaught exception handler", e);
} finally {
Logger.getLogger().d("Completed exception processing. Invoking default exception handler.");
defaultHandler.uncaughtException(thread, ex);
if (defaultHandler != null) {
Logger.getLogger().d("Completed exception processing. Invoking default exception handler.");
defaultHandler.uncaughtException(thread, ex);
} else {
Logger.getLogger().d("Completed exception processing, but no default exception handler.");
System.exit(1);
}
isHandlingException.set(false);
}
}
Expand Down
Loading