evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #618 from lxcid/master

Browse source 
[Issue #591] Attempts to fix crash caused by incorrect calculation of range when reading data into buffer.
This commit is contained in:
Mattt Thompson 2012-11-01 08:36:03 -07:00
commit aab0ceec08
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AFNetworking/AFHTTPClient.m
View file

@ -1143,12 +1143,12 @@ typedef enum {
intoBuffer:(uint8_t *)buffer intoBuffer:(uint8_t *)buffer
maxLength:(NSUInteger)length maxLength:(NSUInteger)length
{ {
NSRange range = NSMakeRange((NSUInteger)_phaseReadOffset, MIN([data length], length)); NSRange range = NSMakeRange((NSUInteger)_phaseReadOffset, MIN([data length] - ((NSUInteger)_phaseReadOffset), length));
[data getBytes:buffer range:range]; [data getBytes:buffer range:range];
_phaseReadOffset += range.length; _phaseReadOffset += range.length;
if (range.length >= [data length]) { if (((NSUInteger)_phaseReadOffset) >= [data length]) {
[self transitionToNextPhase]; [self transitionToNextPhase];
} }