From 4331d9f0c7f4099743e1d3a57744492687fc0552 Mon Sep 17 00:00:00 2001 From: Dmitry Serov Date: Fri, 19 Apr 2019 02:28:45 +0700 Subject: [PATCH 1/2] Ignore non-URL strings when opening URLs --- macosx/Controller.m | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index 95c494321..e48d51fd9 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1269,8 +1269,14 @@ static void removeKeRangerRansomware() else urlString = [@"http://" stringByAppendingString: urlString]; } + + NSURL * url = [NSURL URLWithString: urlString]; + if (url == nil) + { + return; + } - NSURLRequest * request = [NSURLRequest requestWithURL: [NSURL URLWithString: urlString] + NSURLRequest * request = [NSURLRequest requestWithURL: url cachePolicy: NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval: 60]; if (fPendingTorrentDownloads[[request URL]]) From 4d071deeadc26472b25ba1aa30530241d63352a6 Mon Sep 17 00:00:00 2001 From: Dmitry Serov Date: Fri, 19 Apr 2019 15:41:02 +0700 Subject: [PATCH 2/2] Log attempts to open non-URL strings --- macosx/Controller.m | 1 + 1 file changed, 1 insertion(+) diff --git a/macosx/Controller.m b/macosx/Controller.m index e48d51fd9..7087ca7a9 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1273,6 +1273,7 @@ static void removeKeRangerRansomware() NSURL * url = [NSURL URLWithString: urlString]; if (url == nil) { + NSLog(@"Detected non-URL string \"%@\". Ignoring.", urlString); return; }