Add URL validation for network streams

videolan · Jun 20, 2022 · b7bf94f · b7bf94f
1 parent a1ef05d
commit b7bf94f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/Apple-TV/VLCOpenNetworkStreamTVViewController.m b/Apple-TV/VLCOpenNetworkStreamTVViewController.m
@@ -146,7 +146,9 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 - (void)URLEnteredInField:(id)sender
 {
     NSString *urlString = self.playURLField.text;
-    if (urlString.length) {
+    NSURL *url = [NSURL URLWithString:urlString];
+
+    if (url && url.scheme && url.host) {
         if ([_recentURLs indexOfObject:urlString] != NSNotFound)
             [_recentURLs removeObject:urlString];
 

diff --git a/Sources/VLCOpenNetworkStreamViewController.m b/Sources/VLCOpenNetworkStreamViewController.m
@@ -252,19 +252,23 @@ - (IBAction)openButtonAction:(id)sender
     }
     if (!self.privateToggleButton.selected) {
         NSString *urlString = self.urlField.text;
-        if ([_recentURLs indexOfObject:urlString] != NSNotFound)
-            [_recentURLs removeObject:urlString];
+        NSURL *url = [NSURL URLWithString:urlString];
+
+        if (url && url.scheme && url.host) {
+            if ([_recentURLs indexOfObject:urlString] != NSNotFound)
+                [_recentURLs removeObject:urlString];
+
+            if (_recentURLs.count >= 100)
+                [_recentURLs removeLastObject];
+            [_recentURLs addObject:urlString];
+            if ([self ubiquitousKeyStoreAvailable]) {
+                [[NSUbiquitousKeyValueStore defaultStore] setArray:_recentURLs forKey:kVLCRecentURLs];
+            } else {
+                [[NSUserDefaults standardUserDefaults] setObject:_recentURLs forKey:kVLCRecentURLs];
+            }
 
-        if (_recentURLs.count >= 100)
-            [_recentURLs removeLastObject];
-        [_recentURLs addObject:urlString];
-        if ([self ubiquitousKeyStoreAvailable]) {
-            [[NSUbiquitousKeyValueStore defaultStore] setArray:_recentURLs forKey:kVLCRecentURLs];
-        } else {
-            [[NSUserDefaults standardUserDefaults] setObject:_recentURLs forKey:kVLCRecentURLs];
+            [self.historyTableView reloadData];
         }
-
-        [self.historyTableView reloadData];
     }
     [self.urlField resignFirstResponder];
     [self _openURLStringAndDismiss:self.urlField.text];