patch 8.2.3153: URLs with a dash in the scheme are not recognized
Problem: URLs with a dash in the scheme are not recognized.
Solution: Allow for a scheme with a dash, but not at the start or end.
(Tsuyoshi CHO, closes #8299)
diff --git a/src/misc1.c b/src/misc1.c
index d112d9b..554f10b 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2600,8 +2600,8 @@
}
/*
- * Check if "fname" starts with "name://". Return URL_SLASH if it does.
- * Return URL_BACKSLASH for "name:\\".
+ * Check if "fname" starts with "name://" or "name:\\".
+ * Return URL_SLASH for "name://", URL_BACKSLASH for "name:\\".
* Return zero otherwise.
*/
int
@@ -2609,7 +2609,22 @@
{
char_u *p;
- for (p = fname; isalpha(*p); ++p)
+ // We accept alphabetic characters and a dash in scheme part.
+ // RFC 3986 allows for more, but it increases the risk of matching
+ // non-URL text.
+
+ // first character must be alpha
+ if (!isalpha(*fname))
+ return 0;
+
+ // check body: alpha or dash
+ for (p = fname; (isalpha(*p) || (*p == '-')); ++p)
;
+
+ // check last char is not a dash
+ if (p[-1] == '-')
+ return 0;
+
+ // "://" or ":\\" must follow
return path_is_url(p);
}