Fix and test #23629

Ensure bounds are checked over trailing zero dimensions
JuliaLang · Sep 19, 2017 · d1a0879 · d1a0879
1 parent f65c403
commit d1a0879
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -1753,9 +1753,8 @@ end
 # TODO: Re-enable the disabled tests marked PLI
 # On the Julia side, this definition will gracefully supercede the new behavior (already coded)
 @inline function checkbounds_indices(::Type{Bool}, IA::Tuple{Any,Vararg{Any}}, ::Tuple{})
-    if any(x->unsafe_length(x)!=1, IA)
-        _depwarn_for_trailing_indices(IA)
-    end
+    any(x->unsafe_length(x)==0, IA) && return false
+    any(x->unsafe_length(x)!=1, IA) && return _depwarn_for_trailing_indices(IA)
     return true
 end
 function _depwarn_for_trailing_indices(n::Integer) # Called by the C boundscheck

diff --git a/test/arrayops.jl b/test/arrayops.jl
@@ -2229,3 +2229,9 @@ let a = Vector{Int}[[1]],
     @test eltype([a;b]) == Vector{Float64}
     @test eltype([a;c]) == Vector
 end
+
+# Issue #23629
+@testset "issue 23629" begin
+    @test_throws BoundsError zeros(2,3,0)[2,3]
+    @test_throws BoundsError checkbounds(zeros(2,3,0), 2, 3)
+end