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

2024-07-13 06:12:35 +02:00 · 2024-07-13 06:12:35 +02:00 · fb9e29d4d0
parent 05d620a54f
commit fb9e29d4d0
1 changed files with 3 additions and 2 deletions
--- 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());
        }
    }