xZero707/dockerfiles
1
0
Fork 0
mirror of https://github.com/jessfraz/dockerfiles.git synced 2025-02-17 09:37:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

empty result fix

Browse Source 
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-07-13 20:24:31 -04:00
parent cf4dd75b5c
commit 1e8aea15f8
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
k8scan/main.go
View File

@ -466,8 +466,14 @@ func doMasscan() ([]MasscanResult, error) {
} }
m := []MasscanResult{} m := []MasscanResult{}
// Return early if empty.
if len(b) <= 0 {
return m, nil
}
if err := json.Unmarshal(b, &m); err != nil { if err := json.Unmarshal(b, &m); err != nil {
return nil, fmt.Errorf("unmarshal json failed: %v", err) return nil, fmt.Errorf("unmarshal json failed: %v\nbody: %s", err, string(b))
} }
logrus.Debugf("masscan result: %#v", m) logrus.Debugf("masscan result: %#v", m)
@ -480,5 +486,11 @@ func cleanMasscanOutputFile(file string) ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return []byte(strings.TrimSuffix(strings.TrimSpace(string(b)), ",\n]") + "]"), nil
s := strings.TrimSpace(string(b))
if len(s) <= 0 {
return nil, nil
}
return []byte(strings.TrimSuffix(s, ",\n]") + "]"), nil
} }