Skip to content

RDKEMW-18082: ctrlm coverity cleanup#225

Open
msmith113 wants to merge 24 commits into
developfrom
feature/RDKEMW-18082
Open

RDKEMW-18082: ctrlm coverity cleanup#225
msmith113 wants to merge 24 commits into
developfrom
feature/RDKEMW-18082

Conversation

@msmith113
Copy link
Copy Markdown
Contributor

@msmith113 msmith113 commented May 6, 2026

msmith113 and others added 6 commits May 6, 2026 13:21
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: Copilot <copilot@github.com>
Comment thread ci/build_dependencies.sh Outdated
# 2. Clone the required repositories

XRSDK_REF="1.0.13"
XRSDK_REF="feature/RDKEMW-18082"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update once xr-voice-sdk changes are merged

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps we can point this to "main" so it always uses the latest release version?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes will update this once we merge change for xr-voice-sdk

Comment thread ci/build_dependencies.sh
# We can remove this if added to upstream testframework
git -C entservices-testframework apply "$GITHUB_WORKSPACE/ci/mocks/devicesettings_ctrlm.patch"
git clone --depth 1 --filter=blob:none --branch feature/RDKEMW-18082 https://github.com/rdkcentral/entservices-testframework.git

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update once changes to testframework have been merged

@msmith113 msmith113 marked this pull request as ready for review May 6, 2026 14:41
@msmith113 msmith113 requested a review from a team as a code owner May 6, 2026 14:41
Copilot AI review requested due to automatic review settings May 6, 2026 14:41
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR follows up on prior Coverity/CI integration feedback by removing CI-only shim/patch artifacts and adjusting the native CI dependency/build flow to rely on upstream fixes (via feature branches) rather than local patch layers.

Changes:

  • Removes CI shims/patch files (xlog_ci_compat.h, testframework_overrides.h, devicesettings_ctrlm.patch) and updates CI build flags accordingly.
  • Updates ci/build_dependencies.sh to build and install real xr-voice-sdk headers/libs via CMake instead of copying/stubbing.
  • Adds explicit std:: using-declarations in ctrlm_utils.cpp to replace the removed CI namespace shim behavior.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
src/ctrlm_utils.cpp Adds explicit using std::... declarations to replace reliance on CI shim behavior.
ci/cov_build.sh Removes forced inclusion of deleted CI shim/override headers.
ci/build_dependencies.sh Switches dependency strategy to build/install xr-voice-sdk and drops local testframework patching.
ci/mocks/xlog_ci_compat.h Deleted (CI namespace-compat shim removed).
ci/mocks/testframework_overrides.h Deleted (CI mock gap overrides removed).
ci/mocks/devicesettings_ctrlm.patch Deleted (CI-time patch for testframework mocks removed).

Comment thread src/ctrlm_utils.cpp
Comment thread ci/build_dependencies.sh Outdated
Copilot AI review requested due to automatic review settings May 6, 2026 15:51
if(session->packets_processed > 0) {
uint32_t stream_duration = session->packets_processed * 20; // assume 20 ms per packet
uint32_t samples_per_packet = 320; // 16 kHz samples at 20 ms per packet
// uint32_t samples_per_packet = 320; // 16 kHz samples at 20 ms per packet
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

samples_per_packet is an unused variable, not sure if we want to remove, log it, or something else

Copy link
Copy Markdown
Contributor

@dwolaver dwolaver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looking good

Comment thread ci/build_dependencies.sh Outdated
# 2. Clone the required repositories

XRSDK_REF="1.0.13"
XRSDK_REF="feature/RDKEMW-18082"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps we can point this to "main" so it always uses the latest release version?

Comment thread ci/build_dependencies.sh Outdated
-DSTAGING_BINDIR_NATIVE="/usr/bin" \
-DCMAKE_PROJECT_VERSION="1.0.13"

# xr-voice-sdk adds -Werror unconditionally, strip it for CI until warnings are dealt with
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

follow up ticket for this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created RDKEMW-18169 for this

Comment thread ci/build_dependencies.sh Outdated
@rdkcmf-jenkins
Copy link
Copy Markdown
Contributor

Coverity Issue - Array compared against 0

Comparing an array to null is not useful: ""NEVER" != NULL", since the test will always evaluate as true.

Medium Impact, CWE-398
NO_EFFECT

How to fix

Was ""NEVER"" formerly declared as a pointer?

Issue location

This issue was discovered outside the diff for this Pull Request. You can find it at:
src/ctrlm_utils.cpp:2337

@rdkcmf-jenkins
Copy link
Copy Markdown
Contributor

Coverity Issue - Array compared against 0

Comparing an array to null is not useful: ""NEVER" != NULL", since the test will always evaluate as true.

Medium Impact, CWE-398
NO_EFFECT

How to fix

Was ""NEVER"" formerly declared as a pointer?

Issue location

This issue was discovered outside the diff for this Pull Request. You can find it at:
src/ctrlm_utils.cpp:284

@rdkcmf-jenkins
Copy link
Copy Markdown
Contributor

rdkcmf-jenkins commented May 8, 2026

Coverity Issue - Array compared against 0

Comparing an array to null is not useful: ""NEVER" != NULL", since the test will always evaluate as true.

Medium Impact, CWE-398
NO_EFFECT

How to fix

Was ""NEVER"" formerly declared as a pointer?

Issue location

This issue was discovered outside the diff for this Pull Request. You can find it at:
src/ctrlm_utils.cpp:291

@rdkcmf-jenkins
Copy link
Copy Markdown
Contributor

rdkcmf-jenkins commented May 8, 2026

Coverity Issue - Array compared against 0

Comparing an array to null is not useful: ""NEVER" != NULL", since the test will always evaluate as true.

Medium Impact, CWE-398
NO_EFFECT

How to fix

Was ""NEVER"" formerly declared as a pointer?

Issue location

This issue was discovered outside the diff for this Pull Request. You can find it at:
src/ctrlm_utils.cpp:298

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants