github/GCDWebServer
3
0
Fork 0
mirror of https://github.com/swisspol/GCDWebServer.git synced 2026-05-31 00:00:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255 from iosphere/check-range-location

Browse Source 
Fix NSRangeException by checking range of NSTextCheckingResult
This commit is contained in:
Pierre-Olivier Latour
2016-01-08 09:18:39 -08:00
parent 3873dd1ad3 47a51c3d42
commit 5f2877b85f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GCDWebServer/Core/GCDWebServer.m
+6 -1
View File
@@ -957,7 +957,12 @@ static inline NSString* _EncodeBase64(NSString* string) {
for (NSTextCheckingResult* result in matches) { for (NSTextCheckingResult* result in matches) {
// Start at 1; index 0 is the whole string // Start at 1; index 0 is the whole string
for (NSUInteger i = 1; i < result.numberOfRanges; i++) { for (NSUInteger i = 1; i < result.numberOfRanges; i++) {
[captures addObject:[urlPath substringWithRange:[result rangeAtIndex:i]]]; NSRange range = [result rangeAtIndex:i];
// range is {NSNotFound, 0} "if one of the capture groups did not participate in this particular match"
// see discussion in -[NSRegularExpression firstMatchInString:options:range:]
if (range.location != NSNotFound) {
[captures addObject:[urlPath substringWithRange:range]];
}
} }
} }