jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Ruby] Avoid segfault when a method node has no parentNode (SF#3034054).

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12237 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2010-10-01 04:42:29 +00:00
commit eaada32f26
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.1 (in progress) Version 2.0.1 (in progress)
=========================== ===========================
2010-10-01: olly
[Ruby] Avoid segfault when a method node has no parentNode
(SF#3034054).
2010-10-01: olly 2010-10-01: olly
[Python] Allow reinitialisation to work with an embedded Python [Python] Allow reinitialisation to work with an embedded Python
interpreter (patch from Jim Carroll in SF#3075178). interpreter (patch from Jim Carroll in SF#3075178).

11
Source/Modules/ruby.cxx
View file

@ -2054,8 +2054,15 @@ public:
// Construct real method name // Construct real method name
String* methodName = NewString(""); String* methodName = NewString("");
if ( isMethod ) if ( isMethod ) {
Printv( methodName, Getattr(parentNode(sibl),"sym:name"), ".", NIL ); // Sometimes a method node has no parent (SF#3034054).
// This value is used in an exception message, so just skip the class
// name in this case so at least we don't segfault. This is probably
// just working around a problem elsewhere though.
Node *parent_node = parentNode(sibl);
if (parent_node)
Printv( methodName, Getattr(parent_node,"sym:name"), ".", NIL );
}
Append( methodName, Getattr(sibl,"sym:name" ) ); Append( methodName, Getattr(sibl,"sym:name" ) );
if ( isCtor ) Append( methodName, ".new" ); if ( isCtor ) Append( methodName, ".new" );