Fix StackOverflowError in zip_iteratorsize

JuliaLang · Aug 11, 2016 · 1e7f92c · 1e7f92c
1 parent b066714
commit 1e7f92c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/base/iterator.jl b/base/iterator.jl
@@ -61,6 +61,7 @@ zip_iteratorsize(a, b) = and_iteratorsize(a,b) # as `and_iteratorsize` but inher
 zip_iteratorsize(::HasLength, ::IsInfinite) = HasLength()
 zip_iteratorsize(::HasShape, ::IsInfinite) = HasLength()
 zip_iteratorsize(a::IsInfinite, b) = zip_iteratorsize(b,a)
+zip_iteratorsize(a::IsInfinite, b::IsInfinite) = IsInfinite()
 
 
 immutable Zip1{I} <: AbstractZipIterator

diff --git a/test/functional.jl b/test/functional.jl
@@ -185,6 +185,7 @@ end
 @test Base.iteratorsize(repeated(0, 5))   == Base.HasLength()
 @test Base.iteratoreltype(repeated(0))    == Base.HasEltype()
 @test Base.iteratoreltype(repeated(0, 5)) == Base.HasEltype()
+@test Base.iteratorsize(zip(repeated(0), repeated(0))) == Base.IsInfinite()
 
 
 # product