Merge pull request #23 from JuliaReinforcementLearning/jpsl/bounds

"Fix bounds error in CircularArrayBuffer"

Author: jeremiahpslewis

src/CircularArrayBuffers.jl

@@ -45,7 +45,7 @@ Base.IndexStyle(::CircularArrayBuffer) = IndexLinear()
 
 Base.size(cb::CircularArrayBuffer{T,N}, i::Integer) where {T,N} = i == N ? cb.nframes : size(cb.buffer, i)
 Base.size(cb::CircularArrayBuffer{T,N}) where {T,N} = ntuple(i -> size(cb, i), N)
-Base.getindex(cb::CircularArrayBuffer{T,N}, i::Int) where {T,N} = getindex(cb.buffer, _buffer_index(cb, i))
+Base.getindex(cb::CircularArrayBuffer{T,N}, i::Int) where {T,N} = (@boundscheck checkbounds(cb, i); getindex(cb.buffer, _buffer_index(cb, i)))
 Base.getindex(cb::CircularArrayBuffer{T,N}, I...) where {T,N} = getindex(cb.buffer, Base.front(I)..., _buffer_frame(cb, Base.last(I)))
 
 # !!!

test/runtests.jl

@@ -23,6 +23,15 @@ CUDA.allowscalar(false)
         @test_throws BoundsError @view b[:, 9]
     end
 
+    @testset "Bounds error for zero-length buffer" begin
+        b = CircularVectorBuffer{Bool}(10)
+        @test_throws BoundsError b[end]
+        for i in 1:5
+            push!(b, true)
+        end
+        @test b[end] == true
+    end
+    
     @testset "1D vector" begin
         b = CircularArrayBuffer([[1], [2, 3]])
         push!(b, [4, 5, 6])