ekzyis
/
chessbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing boundary checks

This commit is contained in:
ekzyis 2024-09-18 06:23:51 +02:00
parent 8f5075d668
commit 5e9e4a14d5
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chess/board.go
View File

@ -239,7 +239,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x + 1 xPrev = x + 1
yPrev = y - 2 yPrev = y - 2
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -248,7 +248,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x + 2 xPrev = x + 2
yPrev = y - 1 yPrev = y - 1
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -257,7 +257,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x + 2 xPrev = x + 2
yPrev = y + 1 yPrev = y + 1
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -266,7 +266,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x + 1 xPrev = x + 1
yPrev = y + 2 yPrev = y + 2
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -275,7 +275,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x - 1 xPrev = x - 1
yPrev = y + 2 yPrev = y + 2
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -284,7 +284,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x - 2 xPrev = x - 2
yPrev = y + 1 yPrev = y + 1
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -293,7 +293,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x - 2 xPrev = x - 2
yPrev = y - 1 yPrev = y - 1
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -302,7 +302,7 @@ func (b *Board) moveKnight(position string) error {
xPrev = x - 1 xPrev = x - 1
yPrev = y - 2 yPrev = y - 2
piece = b.tiles[xPrev][yPrev] piece = b.getPiece(xPrev, yPrev)
if piece != nil && piece.Name == Knight && piece.Color == b.turn { if piece != nil && piece.Name == Knight && piece.Color == b.turn {
b.tiles[xPrev][yPrev] = nil b.tiles[xPrev][yPrev] = nil
b.tiles[x][y] = piece b.tiles[x][y] = piece
@ -364,6 +364,13 @@ func getXY(position string) (int, int, error) {
return x, y, nil return x, y, nil
} }
func (b *Board) getPiece(x int, y int) *Piece {
if x < 0 || x >= 8 || y < 0 || y >= 8 {
return nil
}
return b.tiles[x][y]
}
func getTileColor(x, y int) Color { func getTileColor(x, y int) Color {
if x%2 == y%2 { if x%2 == y%2 {
return Light return Light

4
chess/board_test.go
View File

@ -103,9 +103,9 @@ func TestBoardMoveKnight(t *testing.T) {
assertPiece(t, b, "f3", chess.Knight, chess.Light) assertPiece(t, b, "f3", chess.Knight, chess.Light)
assertNoPiece(t, b, "g1") assertNoPiece(t, b, "g1")
b.Move("Nf6") b.Move("Nh6")
assertPiece(t, b, "f6", chess.Knight, chess.Dark) assertPiece(t, b, "h6", chess.Knight, chess.Dark)
assertNoPiece(t, b, "g8") assertNoPiece(t, b, "g8")
} }