root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

imagebuildah: fix crash with empty RUN 

fix a crash when RUN is executed without any argument.

Closes: https://github.com/containers/buildah/issues/5312

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2024-02-01 17:14:13 +01:00
parent b850c711ff
commit 9d516e22e3
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imagebuildah/stage_executor.go
View File

@ -1737,11 +1737,15 @@ func (s *StageExecutor) getCreatedBy(node *parser.Node, addedContentSummary stri
buildArgs := s.getBuildArgsKey() buildArgs := s.getBuildArgsKey()
return "/bin/sh -c #(nop) ARG " + buildArgs return "/bin/sh -c #(nop) ARG " + buildArgs
case "RUN": case "RUN":
shArg := ""
buildArgs := s.getBuildArgsResolvedForRun() buildArgs := s.getBuildArgsResolvedForRun()
if buildArgs != "" { if len(node.Original) > 4 {
return "|" + strconv.Itoa(len(strings.Split(buildArgs, " "))) + " " + buildArgs + " /bin/sh -c " + node.Original[4:] shArg = node.Original[4:]
} }
result := "/bin/sh -c " + node.Original[4:] if buildArgs != "" {
return "|" + strconv.Itoa(len(strings.Split(buildArgs, " "))) + " " + buildArgs + " /bin/sh -c " + shArg
}
result := "/bin/sh -c " + shArg
if len(node.Heredocs) > 0 { if len(node.Heredocs) > 0 {
for _, doc := range node.Heredocs { for _, doc := range node.Heredocs {
heredocContent := strings.TrimSpace(doc.Content) heredocContent := strings.TrimSpace(doc.Content)

15
tests/run.bats
View File

@ -952,3 +952,18 @@ _EOF
fi fi
done done
} }
@test "empty run statement doesn't crash" {
skip_if_no_runtime
_prefetch alpine
cd ${TEST_SCRATCH_DIR}
printf 'FROM alpine\nRUN \\\n echo && echo' > Dockerfile
run_buildah bud --pull=false --layers .
printf 'FROM alpine\nRUN\n echo && echo' > Dockerfile
run_buildah ? bud --pull=false --layers .
expect_output --substring -- "-c requires an argument"
}