Skip to content

fix: Avoid invalid memory access in the logger #310

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
jan-auer merged 3 commits into from
Jun 19, 2020
Merged

fix: Avoid invalid memory access in the logger #310

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
521167c
fix: Avoid unsafety in the logger
Swatinem Jun 19, 2020
e966dd1
add a delay
Swatinem Jun 19, 2020
e457e14
ref: Back out crashpad integration tests
jan-auer Jun 19, 2020
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/sentry_logger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ sentry__logger_defaultlogger(

size_t len = strlen(prefix) + strlen(priority) + strlen(message) + 2;
char *format = sentry_malloc(len);
snprintf("%s%s%s\n", len, prefix, priority, message);
snprintf(format, len, "%s%s%s\n", prefix, priority, message);

vfprintf(stderr, format, args);

Expand Down
32 changes: 20 additions & 12 deletions tests/test_integration_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_capture_http(cmake, httpserver):
run(
tmp_path,
"sentry_example",
["release-env", "capture-event", "add-stacktrace"],
["log", "release-env", "capture-event", "add-stacktrace"],
check=True,
env=env,
)
Expand Down Expand Up @@ -63,14 +63,14 @@ def test_session_http(cmake, httpserver):
run(
tmp_path,
"sentry_example",
["release-env", "start-session"],
["log", "release-env", "start-session"],
check=True,
env=dict(os.environ, SENTRY_DSN=make_dsn(httpserver)),
)
run(
tmp_path,
"sentry_example",
["start-session"],
["log", "start-session"],
check=True,
env=dict(os.environ, SENTRY_DSN=make_dsn(httpserver)),
)
Expand All @@ -92,7 +92,7 @@ def test_capture_and_session_http(cmake, httpserver):
run(
tmp_path,
"sentry_example",
["start-session", "capture-event"],
["log", "start-session", "capture-event"],
check=True,
env=dict(os.environ, SENTRY_DSN=make_dsn(httpserver)),
)
Expand All @@ -113,7 +113,9 @@ def test_capture_and_session_http(cmake, httpserver):
def test_inproc_crash_http(cmake, httpserver):
tmp_path = cmake(["sentry_example"], {"SENTRY_BACKEND": "inproc"})

child = run(tmp_path, "sentry_example", ["start-session", "attachment", "crash"])
child = run(
tmp_path, "sentry_example", ["log", "start-session", "attachment", "crash"]
)
assert child.returncode # well, its a crash after all

httpserver.expect_request(
Expand All @@ -123,7 +125,7 @@ def test_inproc_crash_http(cmake, httpserver):
run(
tmp_path,
"sentry_example",
["no-setup"],
["log", "no-setup"],
check=True,
env=dict(os.environ, SENTRY_DSN=make_dsn(httpserver)),
)
Expand Down Expand Up @@ -154,10 +156,12 @@ def test_inproc_dump_inflight(cmake, httpserver):
).respond_with_data("OK")

env = dict(os.environ, SENTRY_DSN=make_dsn(httpserver))
child = run(tmp_path, "sentry_example", ["capture-multiple", "crash"], env=env)
child = run(
tmp_path, "sentry_example", ["log", "capture-multiple", "crash"], env=env
)
assert child.returncode # well, its a crash after all

run(tmp_path, "sentry_example", ["no-setup"], check=True, env=env)
run(tmp_path, "sentry_example", ["log", "no-setup"], check=True, env=env)

# we trigger 10 normal events, and 1 crash
assert len(httpserver.log) >= 11
Expand All @@ -167,7 +171,9 @@ def test_inproc_dump_inflight(cmake, httpserver):
def test_breakpad_crash_http(cmake, httpserver):
tmp_path = cmake(["sentry_example"], {"SENTRY_BACKEND": "breakpad"})

child = run(tmp_path, "sentry_example", ["start-session", "attachment", "crash"])
child = run(
tmp_path, "sentry_example", ["log", "start-session", "attachment", "crash"]
)
assert child.returncode # well, its a crash after all

httpserver.expect_request(
Expand All @@ -177,7 +183,7 @@ def test_breakpad_crash_http(cmake, httpserver):
run(
tmp_path,
"sentry_example",
["no-setup"],
["log", "no-setup"],
check=True,
env=dict(os.environ, SENTRY_DSN=make_dsn(httpserver)),
)
Expand Down Expand Up @@ -209,10 +215,12 @@ def test_breakpad_dump_inflight(cmake, httpserver):
).respond_with_data("OK")

env = dict(os.environ, SENTRY_DSN=make_dsn(httpserver))
child = run(tmp_path, "sentry_example", ["capture-multiple", "crash"], env=env)
child = run(
tmp_path, "sentry_example", ["log", "capture-multiple", "crash"], env=env
)
assert child.returncode # well, its a crash after all

run(tmp_path, "sentry_example", ["no-setup"], check=True, env=env)
run(tmp_path, "sentry_example", ["log", "no-setup"], check=True, env=env)

# we trigger 10 normal events, and 1 crash
assert len(httpserver.log) >= 11
8 changes: 4 additions & 4 deletions tests/test_integration_ratelimits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ def test_retry_after(cmake, httpserver):
httpserver.expect_oneshot_request("/api/123456/envelope/").respond_with_data(
"OK", 200, {"retry-after": "60"}
)
run(tmp_path, "sentry_example", ["capture-multiple"], check=True, env=env)
run(tmp_path, "sentry_example", ["log", "capture-multiple"], check=True, env=env)
assert len(httpserver.log) == 1

httpserver.expect_oneshot_request("/api/123456/envelope/").respond_with_data(
"OK", 429, {"retry-after": "60"}
)
run(tmp_path, "sentry_example", ["capture-multiple"], check=True, env=env)
run(tmp_path, "sentry_example", ["log", "capture-multiple"], check=True, env=env)
assert len(httpserver.log) == 2


Expand All @@ -35,11 +35,11 @@ def test_rate_limits(cmake, httpserver):
httpserver.expect_oneshot_request("/api/123456/envelope/").respond_with_data(
"OK", 200, headers
)
run(tmp_path, "sentry_example", ["capture-multiple"], check=True, env=env)
run(tmp_path, "sentry_example", ["log", "capture-multiple"], check=True, env=env)
assert len(httpserver.log) == 1

httpserver.expect_oneshot_request("/api/123456/envelope/").respond_with_data(
"OK", 429, headers
)
run(tmp_path, "sentry_example", ["capture-multiple"], check=True, env=env)
run(tmp_path, "sentry_example", ["log", "capture-multiple"], check=True, env=env)
assert len(httpserver.log) == 2