gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix error unarchiving self referential objects.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18494 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2004-01-28 06:21:33 +00:00
parent 2878a6472f
commit 43eff241a0
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/NSKeyedUnarchiver.m
View file

@ -192,6 +192,8 @@ static NSMapTable globalClassMap = 0;
_keyMap = obj; // Dictionary describing object
o = [c allocWithZone: _zone]; // Create instance.
// Store object in map so that decoding of it cn be self refrential.
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)o, index);
r = [o initWithCoder: self];
if (r != o)
{
@ -199,6 +201,7 @@ static NSMapTable globalClassMap = 0;
willReplaceObject: o
withObject: r];
o = r;
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)o, index);
}
r = [o awakeAfterUsingCoder: self];
if (r != o)
@ -207,6 +210,7 @@ static NSMapTable globalClassMap = 0;
willReplaceObject: o
withObject: r];
o = r;
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)o, index);
}
if (_delegate != nil)
@ -218,6 +222,7 @@ static NSMapTable globalClassMap = 0;
willReplaceObject: o
withObject: r];
o = r;
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)o, index);
}
}
@ -236,9 +241,9 @@ static NSMapTable globalClassMap = 0;
else
{
RETAIN(obj); // Use the decoded object directly
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)obj, index);
}
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)obj, index);
return obj;
}
@end