Fix core dump when cast returns a non Geos object (#261)

rgeo · Jun 27, 2021 · 6f24106 · 6f24106
1 parent 42e48d0
commit 6f24106
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/ext/geos_c_impl/factory.c b/ext/geos_c_impl/factory.c
@@ -773,7 +773,6 @@ VALUE rgeo_wrap_geos_geometry_clone(VALUE factory, const GEOSGeometry* geom, VAL
 const GEOSGeometry* rgeo_convert_to_geos_geometry(VALUE factory, VALUE obj, VALUE type)
 {
   VALUE object;
-  const GEOSGeometry* geom;
   RGeo_Globals* globals;
 
   if (NIL_P(type) && TYPE(obj) == T_DATA && RDATA(obj)->dfree == (RUBY_DATA_FUNC)destroy_geometry_func && RGEO_GEOMETRY_DATA_PTR(obj)->factory == factory) {
@@ -783,11 +782,11 @@ const GEOSGeometry* rgeo_convert_to_geos_geometry(VALUE factory, VALUE obj, VALU
     globals = RGEO_FACTORY_DATA_PTR(factory)->globals;
     object = rb_funcall(globals->feature_module, globals->id_cast, 3, obj, factory, type);
   }
-  geom = NULL;
-  if (!NIL_P(object)) {
-    geom = RGEO_GEOMETRY_DATA_PTR(object)->geom;
-  }
-  return geom;
+  if (NIL_P(object))
+    return NULL;
+
+  Check_Type(object, T_DATA);
+  return RGEO_GEOMETRY_DATA_PTR(object)->geom;
 }
 
 

diff --git a/test/geos_capi/misc_test.rb b/test/geos_capi/misc_test.rb
@@ -6,7 +6,8 @@
 #
 # -----------------------------------------------------------------------------
 
-require "test_helper"
+require "ostruct"
+require_relative "../test_helper"
 
 class GeosMiscTest < Minitest::Test # :nodoc:
   def setup
@@ -137,6 +138,12 @@ def test_unary_union_mixed_collection
       assert_equal(nil, geom)
     end
   end
+
+  def test_casting_dumb_objects
+    assert_raises(TypeError) do
+      RGeo::Geos.factory.point(1, 1).contains?(OpenStruct.new(factory: RGeo::Geos.factory))
+    end
+  end
 end if RGeo::Geos.capi_supported?
 
 unless RGeo::Geos.capi_supported?