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

Don't override existing entries when inheriting various hashes.

Browse source 
Check if the value being inherited doesn't already exist for the derived
class: if it does, we must not overwrite it.

Fixes regression introduced in r12865.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12874 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Vadim Zeitlin 2011-12-11 16:29:51 +00:00
commit 9cdc66cc84
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Swig/naming.c
View file

@ -590,11 +590,12 @@ void Swig_name_object_inherit(Hash *namehash, String *base, String *derived) {
Hash *n = ki.item; Hash *n = ki.item;
Hash *newh; Hash *newh;
if (!derh) /* Don't overwrite an existing value for the derived class, if any. */
derh = NewHash(); newh = Getattr(namehash, nkey);
newh = Getattr(derh, nkey);
if (!newh) { if (!newh) {
if (!derh)
derh = NewHash();
newh = NewHash(); newh = NewHash();
Setattr(derh, nkey, newh); Setattr(derh, nkey, newh);
Delete(newh); Delete(newh);