From e5f962dc3f8fca2ce131cc78201f07d48fe6fed6 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 10 Jul 2015 11:43:47 -0700 Subject: [PATCH] Perform stricter status checks during pairing to fix a crash when paired=3 --- Limelight/Network/PairManager.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Limelight/Network/PairManager.m b/Limelight/Network/PairManager.m index 82ff2b2..b81d3d4 100644 --- a/Limelight/Network/PairManager.m +++ b/Limelight/Network/PairManager.m @@ -79,7 +79,7 @@ if (![self verifyResponseStatus:challengeResp]) { return; } - if (![challengeResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) { + if (![challengeResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) { [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]]; [_callback pairFailed:@"Pairing stage #2 failed"]; return; @@ -100,7 +100,7 @@ if (![self verifyResponseStatus:secretResp]) { return; } - if (![secretResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) { + if (![secretResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) { [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]]; [_callback pairFailed:@"Pairing stage #3 failed"]; return; @@ -129,7 +129,7 @@ if (![self verifyResponseStatus:clientSecretResp]) { return; } - if (![clientSecretResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) { + if (![clientSecretResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) { [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]]; [_callback pairFailed:@"Pairing stage #4 failed"]; return; @@ -140,7 +140,7 @@ if (![self verifyResponseStatus:clientPairChallengeResp]) { return; } - if (![clientPairChallengeResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) { + if (![clientPairChallengeResp getIntTag:@"paired" value:&pairedStatus] || pairedStatus != 1) { [_httpManager executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]]; [_callback pairFailed:@"Pairing stage #5 failed"]; return;