queue runner: fix nullptr deref on build exception after releasing a …

…machine reservation
NixOS · Feb 16, 2025 · c3b6e7b · c3b6e7b
1 parent c60e795
commit c3b6e7b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc
@@ -37,11 +37,12 @@ void State::builder(MachineReservation::ptr reservation)
 
         try {
             auto destStore = getDestStore();
+            // Might release the reservation.
             res = doBuildStep(destStore, reservation, activeStep);
         } catch (std::exception & e) {
             printMsg(lvlError, "uncaught exception building ‘%s’ on ‘%s’: %s",
-                localStore->printStorePath(reservation->step->drvPath),
-                reservation->machine->sshName,
+                localStore->printStorePath(activeStep->step->drvPath),
+                reservation ? reservation->machine->sshName : std::string("(no machine)"),
                 e.what());
         }
     }