Fix some boundary conditions of substring

This commit is contained in:
Sunnyyoung 2019-09-06 23:17:37 +08:00
parent 55e5aff593
commit ec6823a564

View File

@ -12,8 +12,17 @@
- (NSString *)tweak_subStringFrom:(NSString *)beginString to:(NSString *)endString { - (NSString *)tweak_subStringFrom:(NSString *)beginString to:(NSString *)endString {
NSRange begin = [self rangeOfString:beginString]; NSRange begin = [self rangeOfString:beginString];
if (begin.location == NSNotFound) {
return nil;
}
NSRange end = [self rangeOfString:endString]; NSRange end = [self rangeOfString:endString];
if (end.location == NSNotFound) {
return nil;
}
NSRange range = NSMakeRange(begin.location + begin.length, end.location - begin.location - begin.length); NSRange range = NSMakeRange(begin.location + begin.length, end.location - begin.location - begin.length);
if (range.location == NSNotFound) {
return nil;
}
return [self substringWithRange:range]; return [self substringWithRange:range];
} }