Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/future-architect/vuls

Browse Source 
* 'master' of https://github.com/future-architect/vuls:
  Fix a bug of making channels when fill oval information via HTTP (#514)
This commit is contained in:
kota kanbe
2017-10-17 13:37:06 +09:00
parent 15a0f7eadb a32845f652
commit 0eae26e261
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
oval/util.go
View File

@@ -88,17 +88,16 @@ type response struct {
func getDefsByPackNameViaHTTP(r *models.ScanResult) (
relatedDefs ovalResult, err error) {
reqChan := make(chan request, len(r.Packages))
resChan := make(chan response, len(r.Packages))
errChan := make(chan error, len(r.Packages))
nReq := len(r.Packages) + len(r.SrcPackages)
reqChan := make(chan request, nReq)
resChan := make(chan response, nReq)
errChan := make(chan error, nReq)
defer close(reqChan)
defer close(resChan)
defer close(errChan)
names := []string{}
go func() {
for _, pack := range r.Packages {
names = append(names, pack.Name)
reqChan <- request{
packName: pack.Name,
versionRelease: pack.FormatVer(),
@@ -106,7 +105,6 @@ func getDefsByPackNameViaHTTP(r *models.ScanResult) (
isSrcPack: false,
}
for _, pack := range r.SrcPackages {
names = append(names, pack.Name)
reqChan <- request{
packName: pack.Name,
binaryPackNames: pack.BinaryNames,
@@ -120,7 +118,7 @@ func getDefsByPackNameViaHTTP(r *models.ScanResult) (
concurrency := 10
tasks := util.GenWorkers(concurrency)
for range names {
for i := 0; i < nReq; i++ {
tasks <- func() {
select {
case req := <-reqChan:
@@ -143,7 +141,7 @@ func getDefsByPackNameViaHTTP(r *models.ScanResult) (
timeout := time.After(2 * 60 * time.Second)
var errs []error
for range names {
for i := 0; i < nReq; i++ {
select {
case res := <-resChan:
for _, def := range res.defs {