Merge pull request #66 from EspressoSystems/fix/executor-error-handling

Don't segfault when the executor fails with no response
EspressoSystems · Aug 23, 2023 · d8cc5fa · d8cc5fa
2 parents 2469f8a + a19ebf8
commit d8cc5fa
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/state/state.go b/state/state.go
@@ -547,7 +547,10 @@ func (s *State) ExecuteBatch(ctx context.Context, batch Batch, dbTx pgx.Tx) (*pb
 
 	processBatchResponse, err := s.executorClient.ProcessBatch(ctx, processBatchRequest)
 	if err != nil {
-		if processBatchResponse.Error != executor.EXECUTOR_ERROR_NO_ERROR {
+		if processBatchResponse == nil {
+			log.Errorf("error from executor without response: %v", err)
+			err = executor.ExecutorErr(executor.EXECUTOR_ERROR_UNSPECIFIED)
+		} else if processBatchResponse.Error != executor.EXECUTOR_ERROR_NO_ERROR {
 			err = executor.ExecutorErr(processBatchResponse.Error)
 			s.LogExecutorError(processBatchResponse.Error, processBatchRequest)
 		}