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

Replace last change by a better one.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34829 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-02-27 18:35:38 +00:00
parent 6e4e57e690
commit 3b76abbaae
4 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,6 +1,12 @@
2012-02-27 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSXMLNode.m (-copyWithZone:): Copy name spaces as well.
* Source/NSXMLDocument.m (-copyWithZone:): Rewrite copy method.
* Source/NSXMLElement.m: Remove copy method.
2012-02-27 Doug Simons <doug.simons@testplant.com> 2012-02-27 Doug Simons <doug.simons@testplant.com>
Merged to trunk by: greg.casamento@gmail.com Merged to trunk by: greg.casamento@gmail.com
* Source/NSXMLDocument.m: Fix bugs in setCharacterEncoding: and * Source/NSXMLDocument.m: Fix bugs in setCharacterEncoding: and
copyWithZone: that cause a memory crash when tree is freed. copyWithZone: that cause a memory crash when tree is freed.
Doug Simons <doug.simons@testplant.com> Doug Simons <doug.simons@testplant.com>

13
Source/NSXMLDocument.m
View file

@ -76,7 +76,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (NSString*) characterEncoding - (NSString*) characterEncoding
{ {
if (MY_DOC->encoding) if (MY_DOC->encoding)
return [NSString stringWithUTF8String: (const char *)MY_DOC->encoding]; return StringFromXMLStringPtr(MY_DOC->encoding);
else else
return nil; return nil;
} }
@ -229,7 +229,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (void) setCharacterEncoding: (NSString*)encoding - (void) setCharacterEncoding: (NSString*)encoding
{ {
MY_DOC->encoding = xmlStrdup(XMLSTRING(encoding)); MY_DOC->encoding = XMLStringCopy(encoding);
} }
- (void) setDocumentContentKind: (NSXMLDocumentContentKind)kind - (void) setDocumentContentKind: (NSXMLDocumentContentKind)kind
@ -475,12 +475,11 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (id) copyWithZone: (NSZone *)zone - (id) copyWithZone: (NSZone *)zone
{ {
id c = [[self class] allocWithZone: zone]; NSXMLDocument *c = (NSXMLDocument*)[super copyWithZone: zone];
xmlDocPtr newNode = xmlCopyDoc(MY_DOC, 1); // make a deep copy
clearPrivatePointers((xmlNodePtr)newNode);
c = [c _initWithNode:(xmlNodePtr)newNode kind:internal->kind];
[c setMIMEType: [self MIMEType]];
[c setDTD: [self DTD]];
[c setDocumentContentKind: [self documentContentKind]];
return c; return c;
} }

9
Source/NSXMLElement.m
View file

@ -554,15 +554,6 @@ static void joinTextNodes(xmlNodePtr nodeA, xmlNodePtr nodeB, NSMutableArray *no
} }
} }
- (id) copyWithZone: (NSZone *)zone
{
NSXMLElement *c = [[self class] alloc]; ///(NSXMLElement*)[super copyWithZone: zone];
xmlNodePtr newNode = (xmlNodePtr)xmlCopyNode(MY_NODE, 1); // copy recursively
clearPrivatePointers(newNode); // clear out all of the _private pointers in the entire tree
c = [c _initWithNode:newNode kind:internal->kind];
return c;
}
@end @end
#endif #endif

7
Source/NSXMLNode.m
View file

@ -937,15 +937,12 @@ NSArray *execute_xpath(NSXMLNode *xmlNode,
- (id) copyWithZone: (NSZone*)zone - (id) copyWithZone: (NSZone*)zone
{ {
id c = [[self class] allocWithZone: zone]; id c = [[self class] allocWithZone: zone];
xmlNodePtr newNode = xmlCopyNode([self _node], 1); // make a deep copy // make a deep copy
xmlNodePtr newNode = xmlCopyNode([self _node], 2);
clearPrivatePointers(newNode); clearPrivatePointers(newNode);
//c = [c initWithKind: internal->kind options: internal->options];
//[c _setNode: newNode];
c = [c _initWithNode: newNode kind: internal->kind]; c = [c _initWithNode: newNode kind: internal->kind];
// [c setName: [self name]]; // [c setName: [self name]];
// [c setURI: [self URI]]; // [c setURI: [self URI]];
// [c setObjectValue: [self objectValue]]; // [c setObjectValue: [self objectValue]];