Merge v1.56.1 into main#2214
Merged
openshift-merge-bot[bot] merged 4 commits intocontainers:mainfrom Jan 15, 2025
Merged
Conversation
In go one should never modify a slice while also iterating over it at
the same time. This causes weird side effects as the underlying array
elements are shifted around without the range loop index knowing.
So if you delete a element the loop will then actually skip the next one
and theoretically access out of bounds on the last element which does
not panic but rather return the default zero type, nil here which then
causes the panic on layer.Flags == nil.
Here is a simple example to show the behavior:
func main() {
slice := []int{1, 2, 3, 4, 5, 6, 7, 8, 9}
for _, num := range slice {
if num == 5 {
slice = slices.DeleteFunc(slice, func(n int) bool {
return n == 5
})
}
fmt.Println(num)
}
}
The loop will not print 6, but then as last number it prints 0 (the
default zero type for an int).
Fixes containers#2184
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 99b0d2d)
[release-1.56] store: correctly remove incomplete layers on load.
In preparation for Podman v5.3.2, bump c/storage to v1.56.1. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
Collaborator
Author
|
@TomSweeneyRedHat @giuseppe PTAL; this is blocking containers/image#2613 . |
Member
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: giuseppe, mtrmac, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
This file contains hidden or 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
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.
This allows referring to commits on
mainfrom c/image, without Go trying to “upgrade” from a pre-v1.57 tov1.56.1. The parent relationship created by the merge tells Go that themaincommit is newer than v1.56.1.(Yes, this changes no lines of code. The created “parent” link is what matters.)