eth/downloader: fix index error

eth/downloader/queue.go

@@ -833,13 +833,8 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header, taskQ
 		}
 	}
 	// Assemble each of the results with their headers and retrieved data parts
-	type acceptedItem struct {
-		hash  common.Hash
-		index int
-	}
 	var (
 		failure error
-		acceptedItems []acceptedItem
 		i       int
 	)
 	// Need the read lock to access resultcache
@@ -849,38 +844,40 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header, taskQ
 		if i >= results {
 			break
 		}
-		// Reconstruct the next result if contents match up
+		// Validate the fields
-		index := int(header.Number.Int64() - int64(q.resultOffset))
+		if err := validate(i, header.TxHash, header.UncleHash, header.ReceiptHash); err != nil {
-		if index >= len(q.resultCache) || index < 0 || q.resultCache[index] == nil {
-			failure = errInvalidChain
-			break
-		}
-		if err := validate(index, header.TxHash, header.UncleHash, header.ReceiptHash); err != nil {
 			failure = err
 			break
 		}
-		hash := header.Hash()
+		header.Hash()
-		acceptedItems = append(acceptedItems, acceptedItem{hash, index})
-		// Clean up a successful fetch
-		request.Headers[i] = nil
 		i++
 	}
 	q.lock.RUnlock()
 	q.lock.Lock()
-	for _, item := range acceptedItems {
+	var acceptCount = 0
-		donePool[item.hash] = struct{}{}
+	for _, header := range request.Headers[:i] {
-		if item.index < len(q.resultCache) {
+		index := int(header.Number.Int64() - int64(q.resultOffset))
-			if res := q.resultCache[item.index]; res != nil {
+		if index >= len(q.resultCache) || index < 0 {
-				reconstruct(item.index, res)
+			// TODO! this should probably be errStaleDelivery instead
-				res.Pending--
+			failure = errStaleDelivery
-				delete(taskPool, item.hash)
+			break
 		}
+		if res := q.resultCache[index]; res != nil {
+			hash := header.Hash()
+			donePool[hash] = struct{}{}
+			reconstruct(acceptCount, res)
+			res.Pending--
+			delete(taskPool, hash)
 		}
 		// else: betweeen here and above, some other peer filled this result
 		// we just ignore and move on
+
+		// Clean up a successful fetch
+		request.Headers[acceptCount] = nil
+		acceptCount++
 	}
 	// Return all failed or missing fetches to the queue
-	for _, header := range request.Headers[i:] {
+	for _, header := range request.Headers[acceptCount:] {
 		if header != nil {
 			taskQueue.Push(header, -int64(header.Number.Uint64()))
 		}
@@ -888,7 +885,6 @@ func (q *queue) deliver(id string, taskPool map[common.Hash]*types.Header, taskQ
 	q.lock.Unlock()
 
 	// Wake up Results
-	var acceptCount = len(acceptedItems)
 	if acceptCount > 0 {
 		q.active.Signal()
 	}