From ec6823a5649e54aa0385f0d680dc0685e7f3f152 Mon Sep 17 00:00:00 2001
From: Sunnyyoung <iSunnyyoung@gmail.com>
Date: Fri, 6 Sep 2019 23:17:37 +0800
Subject: [PATCH] Fix some boundary conditions of substring

---
 WeChatTweak/Category/NSString+WeChatTweak.m | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/WeChatTweak/Category/NSString+WeChatTweak.m b/WeChatTweak/Category/NSString+WeChatTweak.m
index 8996815..33e0c7a 100644
--- a/WeChatTweak/Category/NSString+WeChatTweak.m
+++ b/WeChatTweak/Category/NSString+WeChatTweak.m
@@ -12,8 +12,17 @@
 
 - (NSString *)tweak_subStringFrom:(NSString *)beginString to:(NSString *)endString {
     NSRange begin = [self rangeOfString:beginString];
+    if (begin.location == NSNotFound) {
+        return nil;
+    }
     NSRange end = [self rangeOfString:endString];
+    if (end.location == NSNotFound) {
+        return nil;
+    }
     NSRange range = NSMakeRange(begin.location + begin.length, end.location - begin.location - begin.length);
+    if (range.location == NSNotFound) {
+        return nil;
+    }
     return [self substringWithRange:range];
 }