containerd
diff --git a/‎contrib/fuzz/container_fuzzer.go‎
Lines changed: 6 additions & 5 deletions b/‎contrib/fuzz/container_fuzzer.go‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎contrib/fuzz/containerd_import_fuzzer.go‎
Lines changed: 10 additions & 1 deletion b/‎contrib/fuzz/containerd_import_fuzzer.go‎
Lines changed: 10 additions & 1 deletion
@@ -26,17 +26,18 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	fuzz "github.com/AdaLogics/go-fuzz-headers"
-	"github.com/containerd/containerd"
-	"github.com/containerd/containerd/oci"
-	"github.com/containerd/containerd/sys"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"os"
-	"os/exec"
 	"strings"
 	"time"
+
+	fuzz "github.com/AdaLogics/go-fuzz-headers"
+	"github.com/containerd/containerd"
+	"github.com/containerd/containerd/oci"
+	"github.com/containerd/containerd/sys"
+	exec "golang.org/x/sys/execabs"
 )
 
 var (
 
@@ -18,6 +18,8 @@ package fuzz
 import (
 	"bytes"
 	"context"
+	"sync"
+	"time"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
@@ -33,7 +35,11 @@ const (
 	defaultAddress = "/tmp/containerd/containerd.sock"
 )
 
-func init() {
+var (
+	initDaemon sync.Once
+)
+
+func startDaemon() {
 	args := []string{"--log-level", "debug"}
 	go func() {
 		// This is similar to invoking the
@@ -42,6 +48,7 @@ func init() {
 		// for more info.
 		command.StartDaemonForFuzzing(args)
 	}()
+	time.Sleep(time.Second * 4)
 }
 
 func fuzzContext() (context.Context, context.CancelFunc) {
@@ -51,6 +58,8 @@ func fuzzContext() (context.Context, context.CancelFunc) {
 }
 
 func FuzzContainerdImport(data []byte) int {
+	initDaemon.Do(startDaemon)
+
 	client, err := containerd.New(defaultAddress)
 	if err != nil {
 		return 0