syz-manager: fix snapshotRun() return values

1) Include output in queue.Result only if it was requested.
2) Always return the output to the caller -- we use it for crash
   detection.

1 files changed, 10 insertions, 10 deletions

diff --git a/syz-manager/snapshot.go b/syz-manager/snapshot.go
index 8bd27a1c6..8b939a1f6 100644
--- a/syz-manager/snapshot.go
+++ b/syz-manager/snapshot.go
@@ -160,16 +160,16 @@ func (mgr *Manager) snapshotRun(inst *vm.Instance, builder *flatbuffers.Builder,
 			execError = msg.Error
 		}
 	}
-	status := queue.Success
-	var resErr error
+	ret := &queue.Result{
+		Status: queue.Success,
+		Info:   info,
+	}
 	if execError != "" {
-		status = queue.ExecFailure
-		resErr = errors.New(execError)
+		ret.Status = queue.ExecFailure
+		ret.Err = errors.New(execError)
 	}
-	return &queue.Result{
-		Status: status,
-		Info:   info,
-		Output: output,
-		Err:    resErr,
-	}, nil, nil
+	if req.ReturnOutput {
+		ret.Output = output
+	}
+	return ret, output, nil
 }