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

Check against integer overflow in RCTNetworking decodeTextData #16286

Closed
wants to merge 9 commits into from
Closed

Check against integer overflow in RCTNetworking decodeTextData #16286

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
06f715d
Check against integer overflow in RCTNetworking decodeTextData
cdlewis Oct 10, 2017
acb0f92
Merge branch 'master' into clewis_networking_overflow
cdlewis Oct 11, 2017
55a6cad
use setLength instead of setData
cdlewis Oct 11, 2017
c0c8db4
Merge branch 'master' into clewis_networking_overflow
cdlewis Oct 11, 2017
12fc52b
Merge branch 'master' into clewis_networking_overflow
cdlewis Oct 12, 2017
91d9bab
Merge branch 'master' into clewis_networking_overflow
cdlewis Oct 15, 2017
aa9dd60
Merge branch 'master' into clewis_networking_overflow
cdlewis Oct 22, 2017
0017554
Merge branch 'master' into clewis_networking_overflow
cdlewis Oct 30, 2017
7f9fdd3
Merge branch 'master' into clewis_networking_overflow
cdlewis Nov 4, 2017
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
10 changes: 8 additions & 2 deletions Libraries/Network/RCTNetworking.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,14 @@ + (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)respon

if (inputCarryData) {
NSUInteger encodedResponseLength = [encodedResponse dataUsingEncoding:encoding].length;
NSData *newCarryData = [currentCarryData subdataWithRange:NSMakeRange(encodedResponseLength, currentCarryData.length - encodedResponseLength)];
[inputCarryData setData:newCarryData];

// Ensure a valid subrange exists within currentCarryData
if (currentCarryData.length >= encodedResponseLength) {
NSData *newCarryData = [currentCarryData subdataWithRange:NSMakeRange(encodedResponseLength, currentCarryData.length - encodedResponseLength)];
[inputCarryData setData:newCarryData];
} else {
[inputCarryData setLength:0];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I intended to have this in my original PR. You can't setData:nil.

}
}

return encodedResponse;
Expand Down