Add bounds checking when indexing into collections

Fixes #130

Author: yeesian

src/geos_functions.jl

@@ -76,6 +76,9 @@ end
 
 # Set ordinate values in a Coordinate Sequence (Return 0 on exception)
 function setX!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext = _context)
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     result = GEOSCoordSeq_setX_r(context.ptr, ptr, i - 1, value)
     if result == 0
         error("LibGEOS: Error in GEOSCoordSeq_setX")
@@ -84,6 +87,9 @@ function setX!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext
 end
 
 function setY!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext = _context)
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     result = GEOSCoordSeq_setY_r(context.ptr, ptr, i - 1, value)
     if result == 0
         error("LibGEOS: Error in GEOSCoordSeq_setY")
@@ -92,6 +98,9 @@ function setY!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext
 end
 
 function setZ!(ptr::GEOSCoordSeq, i::Integer, value::Real, context::GEOSContext = _context)
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     result = GEOSCoordSeq_setZ_r(context.ptr, ptr, i - 1, value)
     if result == 0
         error("LibGEOS: Error in GEOSCoordSeq_setZ")
@@ -128,6 +137,9 @@ function setCoordSeq!(
 )
     ndim = length(coords)
     @assert ndim >= 2
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     setX!(ptr, i, coords[1], context)
     setY!(ptr, i, coords[2], context)
     ndim >= 3 && setZ!(ptr, i, coords[3], context)
@@ -188,6 +200,9 @@ function createCoordSeq(coords::Vector{Vector{Float64}}, context::GEOSContext =
 end
 
 function getX(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     out = Ref{Float64}()
     result = GEOSCoordSeq_getX_r(context.ptr, ptr, i - 1, out)
     if result == 0
@@ -208,6 +223,9 @@ function getX(ptr::GEOSCoordSeq, context::GEOSContext = _context)
 end
 
 function getY(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     out = Ref{Float64}()
     result = GEOSCoordSeq_getY_r(context.ptr, ptr, i - 1, out)
     if result == 0
@@ -228,6 +246,9 @@ function getY(ptr::GEOSCoordSeq, context::GEOSContext = _context)
 end
 
 function getZ(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     out = Ref{Float64}()
     result = GEOSCoordSeq_getZ_r(context.ptr, ptr, i - 1, out)
     if result == 0
@@ -248,6 +269,9 @@ function getZ(ptr::GEOSCoordSeq, context::GEOSContext = _context)
 end
 
 function getCoordinates(ptr::GEOSCoordSeq, i::Integer, context::GEOSContext = _context)
+    if !(0 < i <= getSize(ptr, context))
+        error("LibGEOS: i=$i is out of bounds for CoordSeq with size=$(getSize(ptr, context))")
+    end
     ndim = getDimensions(ptr, context)
     coord = Array{Float64}(undef, ndim)
     start = pointer(coord)
@@ -1240,6 +1264,9 @@ end
 
 # Call only on LINESTRING, and must be freed by caller (Returns NULL on exception)
 function getPoint(ptr::GEOSGeom, n::Integer, context::GEOSContext = _context)
+    if !(0 < n <= numPoints(ptr, context))
+        error("LibGEOS: n=$n is out of bounds for LineString with numPoints=$(numPoints(ptr, context))")
+    end
     result = GEOSGeomGetPointN_r(context.ptr, ptr, n - 1)
     if result == C_NULL
         error("LibGEOS: Error in GEOSGeomGetPointN")

test/test_geos_functions.jl

@@ -45,10 +45,14 @@ end
     b = LibGEOS.cloneCoordSeq(a)
     @test LibGEOS.getCoordinates(b) == LibGEOS.getCoordinates(a)
     LibGEOS.setCoordSeq!(b, 2, [3.0, 3.0, 3.0])
+    @test_throws ErrorException LibGEOS.setCoordSeq!(b, 0, [3.0, 3.0, 3.0])
+    @test_throws ErrorException LibGEOS.setCoordSeq!(b, 5, [3.0, 3.0, 3.0])
     @test LibGEOS.getCoordinates(a) ==
           Vector{Float64}[[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]]
     @test LibGEOS.getCoordinates(b) ==
           Vector{Float64}[[1, 2, 3], [3, 3, 3], [7, 8, 9], [10, 11, 12]]
+    @test_throws ErrorException LibGEOS.getCoordinates(b, 0)
+    @test_throws ErrorException LibGEOS.getCoordinates(b, 5)
     c = LibGEOS.createPoint(LibGEOS.createCoordSeq(Vector{Float64}[[1, 2]]))
     @test LibGEOS.getCoordinates(LibGEOS.getCoordSeq(c))[1] ≈ [1, 2] atol = 1e-5
 
@@ -185,9 +189,21 @@ end
     LibGEOS.setX!(cs_, 1, x)
     LibGEOS.setY!(cs_, 1, y)
     LibGEOS.setZ!(cs_, 1, z)
+    @test_throws ErrorException LibGEOS.setX!(cs_, 0, x)
+    @test_throws ErrorException LibGEOS.setX!(cs_, 2, x)
+    @test_throws ErrorException LibGEOS.setY!(cs_, 0, y)
+    @test_throws ErrorException LibGEOS.setY!(cs_, 2, y)
+    @test_throws ErrorException LibGEOS.setZ!(cs_, 0, z)
+    @test_throws ErrorException LibGEOS.setZ!(cs_, 2, z)
     @test LibGEOS.getX(cs_, 1) ≈ x atol = 1e-5
     @test LibGEOS.getY(cs_, 1) ≈ y atol = 1e-5
     @test LibGEOS.getZ(cs_, 1) ≈ z atol = 1e-5
+    @test_throws MethodError LibGEOS.getX(cs_, 0, x)
+    @test_throws MethodError LibGEOS.getX(cs_, 2, x)
+    @test_throws MethodError LibGEOS.getY(cs_, 0, y)
+    @test_throws MethodError LibGEOS.getY(cs_, 2, y)
+    @test_throws MethodError LibGEOS.getZ(cs_, 0, z)
+    @test_throws MethodError LibGEOS.getZ(cs_, 2, z)
 
     cs_ = LibGEOS.createCoordSeq(1, ndim = 3)
     @test LibGEOS.getSize(cs_) == 1
@@ -371,6 +387,8 @@ end
     @test !LibGEOS.isClosed(geom1)
     @test LibGEOS.geomTypeId(geom1) == LibGEOS.GEOS_LINESTRING
     @test LibGEOS.numPoints(geom1) == 3
+    @test_throws ErrorException LibGEOS.getPoint(geom1, 0)
+    @test_throws ErrorException LibGEOS.getPoint(geom1, 4)
     @test LibGEOS.geomLength(geom1) ≈ sqrt(100 + 100) atol = 1e-5
     geom2 = LibGEOS.getPoint(geom1, 1)
     @test LibGEOS.getGeomX(geom2) ≈ 0.0 atol = 1e-5