Fixed a bug in Ruby's object tracking functionality. Previously, an object could be returned even if it did not have the correct type. This could occur if a factory class' creation method had a signature returning a base type (like geometry) but in reality a subclass (like Point) was returned. In that case, it would then be impossible to implement a "downcast" method and get back a Ruby object of type Point. Also updated the test-suite to test this situation.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8861 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
51537af05a
commit
e66f81f904
3 changed files with 81 additions and 16 deletions
|
|
@ -149,8 +149,17 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
|
|||
/* Are we tracking this class and have we already returned this Ruby object? */
|
||||
if (sklass->trackObjects) {
|
||||
obj = SWIG_RubyInstanceFor(ptr);
|
||||
|
||||
/* Check the object's type and make sure it has the correct type.
|
||||
It might not in cases where methods do things like
|
||||
downcast methods. */
|
||||
if (obj != Qnil) {
|
||||
return obj;
|
||||
VALUE value = rb_iv_get(obj, "__swigtype__");
|
||||
char* type_name = RSTRING(value)->ptr;
|
||||
|
||||
if (strcmp(type->name, type_name) == 0) {
|
||||
return obj;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue