Check if handler is running to avoid crashes for timed out requests

GEDYSIntraWare · Oct 21, 2019 · 4d38f74 · 4d38f74
1 parent 1733694
commit 4d38f74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ios/IONAssetHandler.h b/src/ios/IONAssetHandler.h
@@ -5,6 +5,7 @@
 
 @property (nonatomic, strong) NSString * basePath;
 @property (nonatomic, strong) NSString * scheme;
+@property (nonatomic) Boolean isRunning;
 
 -(void)setAssetPath:(NSString *)assetPath;
 - (instancetype)initWithBasePath:(NSString *)basePath andScheme:(NSString *)scheme;

diff --git a/src/ios/IONAssetHandler.m b/src/ios/IONAssetHandler.m
@@ -19,6 +19,7 @@ - (instancetype)initWithBasePath:(NSString *)basePath andScheme:(NSString *)sche
 
 - (void)webView:(WKWebView *)webView startURLSchemeTask:(id <WKURLSchemeTask>)urlSchemeTask
 {
+    self.isRunning = true;
     Boolean loadFile = true;
     NSString * startPath = @"";
     NSURL * url = urlSchemeTask.request.URL;
@@ -77,9 +78,12 @@ - (void)webView:(WKWebView *)webView startURLSchemeTask:(id <WKURLSchemeTask>)ur
                     };
                 }
 
-                [urlSchemeTask didReceiveResponse:response];
-                [urlSchemeTask didReceiveData:data];
-                [urlSchemeTask didFinish];
+                // Do not use urlSchemeTask if it has been closed in stopURLSchemeTask
+                if(self.isRunning) {
+                    [urlSchemeTask didReceiveResponse:response];
+                    [urlSchemeTask didReceiveData:data];
+                    [urlSchemeTask didFinish];
+                }
             }] resume];
         } else {
             startPath = self.basePath;
@@ -115,6 +119,7 @@ - (void)webView:(WKWebView *)webView startURLSchemeTask:(id <WKURLSchemeTask>)ur
 
 - (void)webView:(nonnull WKWebView *)webView stopURLSchemeTask:(nonnull id<WKURLSchemeTask>)urlSchemeTask
 {
+    self.isRunning = false;
     NSLog(@"stop");
 }