nil check in salvaging task so to fix nil dereference in it

pfnet-research · Nov 13, 2020 · ccc823f · ccc823f
1 parent d0ecdb4
commit ccc823f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/backend/redis/worker.go b/pkg/backend/redis/worker.go
@@ -360,7 +360,7 @@ func (b *Backend) SalvageWorker(ctx context.Context, queueUID, salvagingWorkerUI
 			pipe.Del(b.workerPendingTaskQueueKey(queue.UID.String(), salvageTargetWorker.UID.String()))
 			pipe.Set(b.workerKey(queue.UID.String(), salvageTargetWorker.UID.String()), marshaledSalvageTargetWorker, -1)
 			for i, t := range tasksToSalvage {
-				if len(t.Status.History) > 0 &&
+				if len(t.Status.History) > 0 && t.Status.History[len(t.Status.History)-1].SalvagedBy != nil &&
 					*t.Status.History[len(t.Status.History)-1].SalvagedBy == salvagingWorker.UID {
 					workerUID := t.Status.History[len(t.Status.History)-1].WorkerUID
 					pipe.SRem(b.workerTasksKey(queue.UID.String(), workerUID), t.UID)