Merge pull request #154 from m-lab/sandbox-soltesz-fix-crash

Check for nil connection after timeout
m-lab · Jul 22, 2019 · bdf98a9 · bdf98a9
2 parents d9ebeca + a1077a7
commit bdf98a9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ndt5/singleserving/server.go b/ndt5/singleserving/server.go
@@ -187,6 +187,9 @@ func (ps *plainServer) ServeOnce(ctx context.Context) (protocol.MeasuredConnecti
 	if err != nil {
 		return nil, err
 	}
+	if conn == nil {
+		return nil, errors.New("nil conn, nil err: " + derivedCtx.Err().Error())
+	}
 	return protocol.AdaptNetConn(conn, conn), nil
 }