fix bug of ? if query params

lightory · Jan 26, 2015 · 26ad79c · 26ad79c
1 parent 6f09ced
commit 26ad79c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/HHRouter/HHRouter.m b/HHRouter/HHRouter.m
@@ -125,9 +125,9 @@ - (NSDictionary*)paramsInRoute:(NSString*)route
     }
 
     // Extract Params From Query.
-    NSArray* pathInfo = [route componentsSeparatedByString:@"?"];
-    if (pathInfo.count > 1) {
-        NSString* paramsString = [pathInfo objectAtIndex:1];
+    NSRange firstRange = [route rangeOfString:@"?"];
+    if (firstRange.location != NSNotFound && route.length > firstRange.location + firstRange.length) {
+        NSString* paramsString = [route substringFromIndex:firstRange.location + firstRange.length];
         NSArray* paramStringArr = [paramsString componentsSeparatedByString:@"&"];
         for (NSString* paramString in paramStringArr) {
             NSArray* paramArr = [paramString componentsSeparatedByString:@"="];
@@ -138,6 +138,7 @@ - (NSDictionary*)paramsInRoute:(NSString*)route
             }
         }
     }
+
     Class class = subRoutes[@"_"];
     if (class_isMetaClass(object_getClass(class))) {
         if ([class isSubclassOfClass:[UIViewController class]]) {