[12_23] length of url protocol >= 2

XmacsLabs · Dec 10, 2023 · 3c0502a · 3c0502a
1 parent 5176da4
commit 3c0502a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/System/Classes/url.cpp b/System/Classes/url.cpp
@@ -247,7 +247,7 @@ url_general (string name, int type= URL_SYSTEM) {
     array<string> tokens  = tokenize (name, "://");
     string        protocol= tokens[0];
     string        path    = tokens[1];
-    if (N (tokens) == 2 && is_alphanum (protocol)) {
+    if (N (tokens) == 2 && is_alphanum (protocol) && N (protocol) >= 2) {
       if (protocol == "file") return file_url (path);
       if (protocol == "http") return http_url (path);
       if (protocol == "https") return https_url (path);

diff --git a/tests/System/Classes/url_test.cpp b/tests/System/Classes/url_test.cpp
@@ -175,6 +175,9 @@ TEST_CASE ("unknown protocol like zotero") {
   url tmfs_u= url_system ("tmfs://git/status");
   string_eq (tmfs_u.protocol (), "tmfs");
   CHECK (!is_or (tmfs_u));
+
+  url c_u= url_system ("C://Program Files/MoganResearch");
+  string_neq (c_u.protocol (), "C");
 }
 
 TEST_MEMORY_LEAK_ALL
diff --git a/tests/lolly_doctests.hpp b/tests/lolly_doctests.hpp
@@ -13,6 +13,14 @@ string_eq (string left, string right) {
   CHECK_EQ (left == right, true);
 }
 
+inline void
+string_neq (string left, string right) {
+  if (left == right) {
+    cout << "same: " << left << LF;
+  }
+  CHECK_EQ (left != right, true);
+}
+
 #define TEST_MEMORY_LEAK_ALL                                                   \
   TEST_CASE ("test memory leak above") { CHECK_EQ (mem_used (), mem_lolly); }