Skip to content
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

Jump to bottom

Data deserialization crash in PTPusherEvent is fixed #186

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

Data deserialization crash in PTPusherEvent is fixed #186

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
3 changes: 2 additions & 1 deletion Library/PTPusherEvent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ - (id)initWithEventName:(NSString *)name channel:(NSString *)channel data:(id)da
_timeReceived = [NSDate date];

// try and deserialize the data as JSON if possible
if ([data respondsToSelector:@selector(dataUsingEncoding:)]) {
if ([data respondsToSelector:@selector(dataUsingEncoding:)] &&
!([data isKindOfClass:[NSString class]] && [data isEqualToString:@""]) ) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this just check isEqual and skip the class check for NSString?

_data = [[[PTJSON JSONParser] objectFromJSONString:data] copy];

if (_data == nil) {
Expand Down