diff options
author | Matthew Heon <mheon@redhat.com> | 2019-03-14 13:19:04 -0400 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2019-04-03 15:11:08 -0400 |
commit | c6255537d9b65326a3bdd1856f700425ecb71367 (patch) | |
tree | 1f3ea92700b4abc54050b1684ff267182475ba8f /cmd/podman | |
parent | 662ae6c0edd65db396c184c288fa93fce8023879 (diff) | |
download | podman-c6255537d9b65326a3bdd1856f700425ecb71367.tar.gz podman-c6255537d9b65326a3bdd1856f700425ecb71367.tar.bz2 podman-c6255537d9b65326a3bdd1856f700425ecb71367.zip |
Fix a potential segfault in podman search
When generating headers for search, we unconditionally
access element 0 of an array, and I saw this segfault in our CI.
There's no reason we have to do this, we're just going through it
to get field names with reflect, so just make a new copy of the
struct in question.
Also, move this code, which is only for CLI display, into
cmd/podman from libpod/image.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/search.go | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/cmd/podman/search.go b/cmd/podman/search.go index a10b9d419..e614887fc 100644 --- a/cmd/podman/search.go +++ b/cmd/podman/search.go @@ -83,11 +83,25 @@ func searchCmd(c *cliconfig.SearchValues) error { if len(results) == 0 { return nil } - out := formats.StdoutTemplateArray{Output: searchToGeneric(results), Template: format, Fields: genSearchOutputMap()} + out := formats.StdoutTemplateArray{Output: searchToGeneric(results), Template: format, Fields: searchHeaderMap()} formats.Writer(out).Out() return nil } +// searchHeaderMap returns the headers of a SearchResult. +func searchHeaderMap() map[string]string { + s := new(image.SearchResult) + v := reflect.Indirect(reflect.ValueOf(s)) + values := make(map[string]string, v.NumField()) + + for i := 0; i < v.NumField(); i++ { + key := v.Type().Field(i).Name + value := key + values[key] = strings.ToUpper(splitCamelCase(value)) + } + return values +} + func genSearchFormat(format string) string { if format != "" { // "\t" from the command line is not being recognized as a tab |