Merge a24bca32580f88bc63a1ff15dfacc86673f03a59 into 38d036d96fd6760192ec5425f0f5e1d8fcd503eb

readline/history.go

@@ -128,15 +128,19 @@ func (rl *Instance) walkHistory(i int) {
 	}
 
 	rl.histOffset += i
+	historyLen := history.Len()
 	if rl.histOffset == 0 {
 		rl.line = []rune(rl.lineBuf)
 		rl.pos = len(rl.lineBuf)
 	} else if rl.histOffset <= -1 {
 		rl.histOffset = 0
+	} else if rl.histOffset > historyLen {
+		// TODO: should this wrap around?s
+		rl.histOffset = 0
 	} else {
 		dedup = true
 		old = string(rl.line)
-		new, err = history.GetLine(history.Len() - rl.histOffset)
+		new, err = history.GetLine(historyLen - rl.histOffset)
 		if err != nil {
 			rl.resetHelpers()
 			print("\r\n" + err.Error() + "\r\n")