bugfix: merge directory exists

Yevgeny Pats · Yevgeny Pats · commit 230180490b71 · 2019-09-30T17:24:38.000+03:00
diff --git a/client/agent.go b/client/agent.go
@@ -95,6 +95,12 @@ func (c *FuzzitClient) runlibFuzzerMerge() error {
 		return nil
 	}
 
+	// this directory should not exist but do to some old bugs it might exist in the corpus, so we delete it
+	if _, err := os.Stat("merge"); err == nil {
+		if err = os.RemoveAll("merge"); err != nil {
+			return err
+		}
+	}
 	if err := os.Mkdir("merge", 0644); err != nil {
 		return err
 	}
diff --git a/client/client.go b/client/client.go
@@ -11,7 +11,7 @@ import (
 )
 
 const FuzzitEndpoint = "https://app.fuzzit.dev"
-const Version = "v2.4.61"
+const Version = "v2.4.62"
 
 type Target struct {
 	Name         string `firestore:"target_name"`

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,12 @@ func (c *FuzzitClient) runlibFuzzerMerge() error {`
`95`	`95`	`return nil`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ // this directory should not exist but do to some old bugs it might exist in the corpus, so we delete it`
	`99`	`+ if _, err := os.Stat("merge"); err == nil {`
	`100`	`+ if err = os.RemoveAll("merge"); err != nil {`
	`101`	`+ return err`
	`102`	`+ }`
	`103`	`+ }`
`98`	`104`	`if err := os.Mkdir("merge", 0644); err != nil {`
`99`	`105`	`return err`
`100`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const FuzzitEndpoint = "https://app.fuzzit.dev"`
`14`		`-const Version = "v2.4.61"`
	`14`	`+const Version = "v2.4.62"`
`15`	`15`
`16`	`16`	`type Target struct {`
`17`	`17`	Name string `firestore:"target_name"`