From: Stefan Nilsson <snilsson@nada.kth.se>
Date: Tue, 20 Mar 2012 21:23:12 +0000 (-0700)
Subject: sort: fix computation of maxDepth to avoid infinite loop
X-Git-Tag: weekly.2012-03-22~25
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c5488d4f004e9f38e5fb996dd709a73aed03cd00;p=gostls13.git

sort: fix computation of maxDepth to avoid infinite loop

The current computation loops indefinitely if n > 1<<30 (for 32-bit ints).

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/5848067
---

diff --git a/src/pkg/sort/sort.go b/src/pkg/sort/sort.go
index 60f2d9ab40..ca715645af 100644
--- a/src/pkg/sort/sort.go
+++ b/src/pkg/sort/sort.go
@@ -186,10 +186,10 @@ func quickSort(data Interface, a, b, maxDepth int) {
 // Sort sorts data.
 // The algorithm used is not guaranteed to be a stable sort.
 func Sort(data Interface) {
-	// Switch to heapsort if depth of 2*ceil(lg(n)) is reached.
+	// Switch to heapsort if depth of 2*ceil(lg(n+1)) is reached.
 	n := data.Len()
 	maxDepth := 0
-	for 1<<uint(maxDepth) < n {
+	for i := n; i > 0; i >>= 1 {
 		maxDepth++
 	}
 	maxDepth *= 2