Skip to content

java.math.BigDecimal and java.io.File typed Map should not be added to the ref list #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pierredavidbelanger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

java.math.BigDecimal and java.io.File typed Map should not be added to the ref list #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion HessianClasses/CWHessianArchiver+Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
-(NSData*)readDataWithTag:(char)tag;
-(NSException*)readFault;
-(NSArray*)readList;
-(id)readMapWithTypedObject:(id)typedObject;
-(id)readMapWithTypedObject:(id)typedObject asRef:(BOOL)asRef;
-(id)readMap;
-(CWDistantHessianObject*)readRemote;

Expand Down
16 changes: 10 additions & 6 deletions HessianClasses/CWHessianUnarchiver+Private.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,15 @@ -(NSArray*)readList;
return list;
}

-(id)readMapWithTypedObject:(id)typedObject;
-(id)readMapWithTypedObject:(id)typedObject asRef:(BOOL)asRef;
{
NSMutableDictionary* map = [NSMutableDictionary dictionary];
if (typedObject) {
[self.objectReferences addObject:typedObject];
} else {
[self.objectReferences addObject:map];
if (asRef) {
if (typedObject) {
[self.objectReferences addObject:typedObject];
} else {
[self.objectReferences addObject:map];
}
}
while ([self peekChar] != 'z') {
NSObject* key = [self readTypedObject];
Expand All @@ -309,10 +311,12 @@ -(id)readMap;
{
NSString* className = nil;
id typedObject = nil;
BOOL asRef = YES;
if ([self peekChar] == 't') {
[self readChar];
className = [self readStringWithTag:'S'];
if ([className length] > 0) {
asRef = !([className isEqualToString:@"java.math.BigDecimal"] || [className isEqualToString:@"java.io.File"]);
Class typedClass = [self classForClassName:className];
if (typedClass) {
typedObject = class_createInstance(typedClass, 0);
Expand All @@ -327,7 +331,7 @@ -(id)readMap;
}
}
}
return [self readMapWithTypedObject:typedObject];
return [self readMapWithTypedObject:typedObject asRef:asRef];
}

-(CWDistantHessianObject*)readRemote;
Expand Down