Skip to content

Fix for DDXMLNode XMLStringWithOptions crash - issue #105 and #113 #1232

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
williamdolke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for DDXMLNode XMLStringWithOptions crash - issue #105 and #113 #1232

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
17 changes: 10 additions & 7 deletions Core/XMPPStream.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,17 +523,18 @@ - (XMPPPresence *)myPresence
{
if (dispatch_get_specific(xmppQueueTag))
{
return myPresence;
XMPPPresence *myPresenceCopy = [myPresence copy];
return myPresenceCopy;
}
else
{
__block XMPPPresence *result;
__block XMPPPresence *myPresenceCopy;

dispatch_sync(xmppQueue, ^{
result = self->myPresence;
myPresenceCopy = [self->myPresence copy];
});

return result;
return myPresenceCopy;
}
}

Expand Down Expand Up @@ -2455,14 +2456,16 @@ - (void)sendPresence:(XMPPPresence *)presence withTag:(long)tag
}});
}

if (modifiedPresence)
__block XMPPPresence *modifiedPresenceCopy = [modifiedPresence copy];

if (modifiedPresenceCopy)
{
dispatch_async(self->xmppQueue, ^{ @autoreleasepool {

if (self->state == STATE_XMPP_CONNECTED) {
[self continueSendPresence:modifiedPresence withTag:tag];
[self continueSendPresence:modifiedPresenceCopy withTag:tag];
} else {
[self failToSendPresence:modifiedPresence];
[self failToSendPresence:modifiedPresenceCopy];
}
}});
}
Expand Down