Skip to content

RDKEMW-21913 : Fix coverity issues (from copilot) in subttxrend-dbus #100

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

Open
krithikasvraman wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKEMW-21913 : Fix coverity issues (from copilot) in subttxrend-dbus #100

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
10 changes: 9 additions & 1 deletion subttxrend-dbus/src/DbusHandlerSubtitles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,15 @@ void DbusHandlerSubtitles::onBusAcquired(GDBusConnection *connection,
GError *gError = nullptr;
if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(subtitlesObj), connection, DBUS_PATH, &gError))
{
m_logger.error("%s: could not export gObject", __func__);
m_logger.error("%s: could not export gObject%s%s", __func__,
(gError != nullptr && gError->message != nullptr) ? " error=" : "",
(gError != nullptr && gError->message != nullptr) ? gError->message : "");

if (gError != nullptr)
{
g_error_free(gError);
gError = nullptr;
}
thiz->doCleanup();
return;
}
Expand Down
10 changes: 9 additions & 1 deletion subttxrend-dbus/src/DbusHandlerTeletext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,15 @@ void DbusHandlerTeletext::onBusAcquired(GDBusConnection *connection,
GError *gError = nullptr;
if (!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(teletextObj), connection, DBUS_PATH, &gError))
{
m_logger.error("%s: could not export gObject", __func__);
m_logger.error("%s: could not export gObject%s%s", __func__,
(gError != nullptr && gError->message != nullptr) ? " error=" : "",
(gError != nullptr && gError->message != nullptr) ? gError->message : "");

if (gError != nullptr)
{
g_error_free(gError);
gError = nullptr;
}
thiz->doCleanup();
return;
}
Expand Down
2 changes: 1 addition & 1 deletion subttxrend-dbus/src/JsonHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ bool JsonHelper::DecodeSubtitleSetMuted(const std::string &jsonText)

std::string JsonHelper::EncodeSubtitleStatusResponse(const SubtitleStatus &status)
{
static const char *JANSSON_SUBTITLE_RESPONSE_FMT = "{s:b, s:b, s:i, s:i s:i}";
static const char *JANSSON_SUBTITLE_RESPONSE_FMT = "{s:b, s:b, s:i, s:i, s:i}";

unique_json_t obj(
json_pack(JANSSON_SUBTITLE_RESPONSE_FMT, "started", status.m_started, "muted", status.m_muted, "type",
Expand Down
Loading