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

NewBuilder(): always initialize Args #147

Merged
merged 1 commit into from
Mar 12, 2020

Conversation

nalind
Copy link
Member

@nalind nalind commented Feb 11, 2020

We modify the Args map member of a Builder object, but we don't make a copy of the initial value that we're given in NewBuilder() before doing that, so we end up modifying the map that we're given. This can be surprising.

In the dispatcher for ARG instructions, we weren't checking that the map wasn't nil before attempting to assign values to it, so we could panic, as in openshift/builder#129.

Fix this by making a fresh map in NewBuilder() and initializing it using the zero or more values from the passed-in map.

We modify the Args map member of a Builder object, but we don't make a
copy of the initial value that we're given in NewBuilder() before doing
that, so we end up modifying the map that we're given.  This can be
surprising.

In the dispatcher for ARG instructions, we weren't checking that the map
wasn't nil before attempting to assign values to it, so we could panic.

Fix this by making a fresh map in NewBuilder() and initializing it using
the zero or more values from the passed-in map.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 11, 2020
@TomSweeneyRedHat
Copy link
Contributor

LGTM, but I'm kinda surprised that we were ever passing in a nil value to NewBuilder()

@nalind
Copy link
Member Author

nalind commented Feb 11, 2020

LGTM, but I'm kinda surprised that we were ever passing in a nil value to NewBuilder()

The CLI versions of podman and buildah weren't, but the openshift builder is. openshift/builder#130 will probably change that.

@rhatdan
Copy link
Contributor

rhatdan commented Mar 12, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants