ipfs: fix potential context leak

sahib · Nov 21, 2018 · fea61c9 · fea61c9
1 parent 9b74b57
commit fea61c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ test:
 	go test -v ./...
 
 lint:
-	find -iname '*.go' -type f ! -path '*vendor*' ! -path '*capnp*' -exec gofmt -w {} \;
+	find -iname '*.go' -type f ! -path '*vendor*' ! -path '*capnp*' -exec gofmt -s -w {} \;
 	find -iname '*.go' -type f ! -path '*vendor*' ! -path '*capnp*' -exec go fix {} \;
 	find -iname '*.go' -type f ! -path '*vendor*' ! -path '*capnp*' -exec golint {} \;
 	find -iname '*.go' -type f ! -path '*vendor*' ! -path '*capnp*' -exec misspell {} \;

diff --git a/backend/ipfs/daemon.go b/backend/ipfs/daemon.go
@@ -172,6 +172,7 @@ func NewWithPort(ipfsPath string, bootstrapAddrs []string, swarmPort int) (*Node
 	ctx, cancel := context.WithCancel(context.Background())
 	ipfsNode, err := createNode(ctx, ipfsPath, swarmPort, true, bootstrapAddrs)
 	if err != nil {
+		cancel()
 		return nil, err
 	}