CFE-4244: Fix RlistEqual comparison on lists of different lengths (3.21.x) #5320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The original issue that leads to this is the fact that the cache for execresult and execresult_as_data were mixed. This is caused by two separate issues: * The function cache uses the args list as key and discards the function itself. This means different function with the same args are considered identical, and cache is reused. * The args are passed as an Rlist, and the used Rlist comparison ignores the additional items of the longest list when comparing two lists of different lengths, leading to treating execresult and execresult_as_data as identical when using the same command and shell args. This PR only fixes the specific case of execresult, but leaves other function cache issues (e.g. host2ip vs. ip2host could be confused). (cherry picked from commit d5a7372) Signed-off-by: Lars Erik Wik <[email protected]>
|
@cf-bottom Jenkins please :) |
|
Sure, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/9815/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-9815/ |
|
Cherry picked from #5313 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The original issue that leads to this is the fact that the cache
for execresult and execresult_as_data were mixed. This is caused by two
separate issues:
itself. This means different function with the same args are considered
identical, and cache is reused.
additional items of the longest list when comparing two lists of
different lengths, leading to treating execresult and execresult_as_data
as identical when using the same command and shell args.
This PR only fixes the specific case of execresult, but leaves other
function cache issues (e.g. host2ip vs. ip2host could be confused).
(cherry picked from commit d5a7372)
Signed-off-by: Lars Erik Wik [email protected]