summaryrefslogtreecommitdiff
path: root/libpod/image/search.go
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2019-03-14 13:19:04 -0400
committerMatthew Heon <mheon@redhat.com>2019-04-03 15:11:08 -0400
commitc6255537d9b65326a3bdd1856f700425ecb71367 (patch)
tree1f3ea92700b4abc54050b1684ff267182475ba8f /libpod/image/search.go
parent662ae6c0edd65db396c184c288fa93fce8023879 (diff)
downloadpodman-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 'libpod/image/search.go')
-rw-r--r--libpod/image/search.go20
1 files changed, 0 insertions, 20 deletions
diff --git a/libpod/image/search.go b/libpod/image/search.go
index 2c66ce284..03a67636b 100644
--- a/libpod/image/search.go
+++ b/libpod/image/search.go
@@ -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) {