opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2651 from mheon/prevent_null_deref

Browse Source 
Fix a potential segfault in podman search
This commit is contained in:
OpenShift Merge Robot
2019-04-03 13:51:40 -07:00
committed by GitHub
parent 42757c1855 c6255537d9
commit 7a2bca54f0
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/podman/search.go
View File

@ -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

20
libpod/image/search.go
View File

@ -2,7 +2,6 @@ package image
import (
"context"
"reflect"
"strconv"
"strings"
"sync"
@ -10,7 +9,6 @@ import (
"github.com/containers/image/docker"
"github.com/containers/image/types"
sysreg "github.com/containers/libpod/pkg/registries"
"github.com/fatih/camelcase"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/sync/semaphore"
@ -63,24 +61,6 @@ type SearchFilter struct {
IsOfficial types.OptionalBool
}
func splitCamelCase(src string) string {
entries := camelcase.Split(src)
return strings.Join(entries, " ")
}
// HeaderMap returns the headers of a SearchResult.
func (s *SearchResult) HeaderMap() map[string]string {
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
}
// SearchImages searches images based on term and the specified SearchOptions
// in all registries.
func SearchImages(term string, options SearchOptions) ([]SearchResult, error) {