Skip to content
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.

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

[CP #1579 > support/v5.13] [Core / Service]: Fixed crash that occured when communicating with eCAL 5.12 services #1580

Merged
merged 1 commit into from
May 3, 2024

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

Cherry-picked PR #1579 to branch support/v5.13.
The cherry-pick has failed.

The following files have caused conflicts:

ecal/service/test/src/ecal_tcp_service_test.cpp

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/a65a831/support/v5.13 origin/support/v5.13
git branch -u origin/cherry-pick/a65a831/support/v5.13
git cherry-pick c0e30492298d1ca6f24159a238dac74fcefac945..a65a831e487636bfe5131a685bea3cc6ca52cc7d

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/a65a831/support/v5.13

After resolving all conflicts, rebase-merge this PR.

…AL 5.12 services (#1579)

The crash occured when a v0 client connected to a service server.
@FlorianReimold FlorianReimold force-pushed the cherry-pick/a65a831/support/v5.13 branch from 26c4953 to 5eddaa0 Compare May 3, 2024 06:44
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

@@ -1609,6 +1609,151 @@ TEST(Callback, SerializedServiceCallbacks) // NOLINT
}
#endif

#if 1
// Call different eCAL Service API functions from within the callbacks
TEST(ecal_service, Callback_ApiCallsFromCallbacks)
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: all parameters should be named in a function [readability-named-parameter]

Suggested change
TEST(ecal_service, Callback_ApiCallsFromCallbacks)
TEST(ecal_service /*unused*/, Callback_ApiCallsFromCallbacks /*unused*/)

@FlorianReimold FlorianReimold marked this pull request as ready for review May 3, 2024 10:03
@FlorianReimold FlorianReimold added the Auto Approve Request Automatic PR Approval label May 3, 2024
@FlorianReimold FlorianReimold merged commit e52a6a8 into support/v5.13 May 3, 2024
11 checks passed
@KerstinKeller KerstinKeller deleted the cherry-pick/a65a831/support/v5.13 branch October 2, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants