Skip to content

gconnman_agent_test.cpp: Fix memory leak when test fails #49

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
EddyTheCo merged 1 commit into from
Aug 25, 2026
Merged

gconnman_agent_test.cpp: Fix memory leak when test fails #49

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
12 changes: 8 additions & 4 deletions tests/gconnman_agent_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ constexpr const char* AGENT_INTERFACE = "net.connman.Agent";
constexpr const char* RETRY_ERROR = "net.connman.Agent.Error.Retry";

auto call_agent(GDBusConnection* bus, const std::string& path,
const gchar* method, GVariant* args, GError** error)
-> GVariant* {
const gchar* method, GVariant* args,
GError** error) -> GVariant* {
return g_dbus_connection_call_sync(
bus, g_dbus_connection_get_unique_name(bus), path.c_str(),
AGENT_INTERFACE, method, args, nullptr, G_DBUS_CALL_FLAGS_NONE,
Expand Down Expand Up @@ -94,10 +94,12 @@ TEST(ConnmanAgent, ReportErrorIsAnswered) {
g_variant_new("(os)", "/net/connman/service/does_not_exist",
"invalid-key"),
&error);
std::unique_ptr<GError, decltype(&g_error_free)> error_guard{error,
&g_error_free};

ASSERT_NE(reply, nullptr)
<< "ReportError was not answered within " << CALL_TIMEOUT_MS
<< "ms: " << (error != nullptr ? error->message : "");
<< "ms: " << (error_guard != nullptr ? error_guard->message : "");
g_variant_unref(reply);
}

Expand Down Expand Up @@ -204,9 +206,11 @@ TEST(ConnmanAgent, CancelIsAnswered) {
GError* error = nullptr;
GVariant* reply = call_agent(bus, manager->internalAgentPath(), "Cancel",
nullptr, &error);
std::unique_ptr<GError, decltype(&g_error_free)> error_guard{error,
&g_error_free};

ASSERT_NE(reply, nullptr)
<< "Cancel was not answered within " << CALL_TIMEOUT_MS
<< "ms: " << (error != nullptr ? error->message : "");
<< "ms: " << (error_guard != nullptr ? error_guard->message : "");
g_variant_unref(reply);
}
Loading