Skip to content

fix(native): Initialize null transport in crash daemon #2048

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

Closed
jpnurmi wants to merge 1 commit into from
Closed

fix(native): Initialize null transport in crash daemon #2048

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
2 changes: 1 addition & 1 deletion src/backends/native/sentry_crash_daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4764,8 +4764,8 @@ sentry__crash_daemon_main(pid_t app_pid, uint64_t app_tid, HANDLE event_handle,
}
if (crash_processed) {
// Mark as done
SENTRY_DEBUG("Marking crash state as DONE");
sentry__atomic_store(&ipc->shmem->state, SENTRY_CRASH_STATE_DONE);
SENTRY_INFO("Marking crash state as DONE");
}
if (crash_processed || !is_parent_alive(ipc->parent_handle)) {
sentry__crash_ipc_unlink(ipc);
Expand Down
4 changes: 0 additions & 4 deletions tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,6 @@ def extract_request(httpserver_log, cond):
def run(
cwd, exe, args, expect_failure=False, env=None, wait_for_daemon=False, **kwargs
):
if wait_for_daemon:
assert (
"log" in args or exe != "sentry_example"
), "sentry_example needs 'log' when waiting for the daemon"
if env is None:
env = dict(os.environ)
if kwargs.get("check"):
Expand Down
15 changes: 15 additions & 0 deletions tests/test_integration_native.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,21 @@ def test_native_capture_crash(cmake, httpserver):
assert_native_crash(envelope)


def test_native_null_transport_completion(cmake):
tmp_path = cmake(
["sentry_example"],
{"SENTRY_BACKEND": "native", "SENTRY_TRANSPORT": "none"},
)

run_crash(
tmp_path,
"sentry_example",
["crash"],
env=dict(os.environ, SENTRY_DSN=""),
wait_for_daemon=True,
)


def test_native_on_crashed_last_run(cmake, httpserver):
tmp_path = cmake(["sentry_example"], {"SENTRY_BACKEND": "native"})
httpserver.expect_oneshot_request("/api/123456/envelope/").respond_with_data("OK")
Expand Down
Loading