fixed panic: sync: WaitGroup is reused before previous Wait has returned 2022-10-11

Author: hktalent

brute/filefuzz.go

@@ -3,6 +3,7 @@ package brute
 import (
 	"context"
 	_ "embed"
+	"fmt"
 	"github.com/antlabs/strsim"
 	"github.com/hktalent/ProScan4all/lib/util"
 	"github.com/hktalent/goSqlite_gorm/lib/scan/Const"
@@ -219,11 +220,15 @@ func FileFuzz(u string, indexStatusCode int, indexContentLength int, indexbody s
 	//log.Printf("start fuzz: %s for", u)
 	nStop := 400
 	var lst200 *util.Response
+	t001 := time.NewTicker(3 * time.Second)
+	var nCnt int32 = 0
 	go func() {
 		for {
 			select {
 			case <-ctx2.Done():
 				return
+			case <-t001.C:
+				fmt.Printf("(ok/total:%5d/%5d) (errs/limitErr:%3d/%3d) %s\r", nCnt, len(filedic), errorTimes, MaxErrorTimes, u)
 			case x1, ok := <-async_data:
 				if ok {
 					if lst200 == nil || x1.Req.Resqonse.Body != lst200.Body {
@@ -266,6 +271,7 @@ func FileFuzz(u string, indexStatusCode int, indexContentLength int, indexbody s
 				wg.Done() // 控制所有线程结束
 				<-ch      // 并发控制
 			}()
+			atomic.AddInt32(&nCnt, 1)
 			for {
 				select {
 				case <-ctx.Done(): // 00-捕获所有线程关闭信号，并退出，close for all

engine/engineImp.go

@@ -31,7 +31,7 @@ func NewEngine(c *context.Context, pool int) *Engine {
 	if nil != util.G_Engine {
 		return util.G_Engine.(*Engine)
 	}
-	x1 := &Engine{Context: c, Wg: util.Wg, Pool: pool, EventData: make(chan *models.EventData, pool)}
+	x1 := &Engine{Context: c, Wg: &sync.WaitGroup{}, Pool: pool, EventData: make(chan *models.EventData, pool)}
 	p, err := ants.NewPoolWithFunc(pool, func(i interface{}) {
 		defer x1.Wg.Done()
 		x1.DoEvent(i.(*models.EventData))

webScan/Functions/Final.go

@@ -134,9 +134,7 @@ func final_ALLurl_ALLJson(urllist *[]string) {
 		//results := make(chan bool, size+1)
 		jobs_url := make(chan string, size+1)
 		for i := 0; i < Configs.UserObject.ThreadNum; i++ {
-			util.Wg.Add(1)
 			util.DoSyncFunc(func() {
-				defer util.Wg.Done()
 				All_url_ALLjson(jobs_url, allresult)
 			})
 		}