From 3a58515d5e61fa2cba3c0780056beb8e4f49e806 Mon Sep 17 00:00:00 2001
From: Robert Lucas <robert01.lucas@protonmail.com>
Date: Wed, 7 Aug 2024 11:57:51 +0100
Subject: [PATCH] Added checks for invalid characters

---
 .idea/workspace.xml           |  22 +++-------
 build/out.asm                 |  78 +++++++++++++++++-----------------
 build/out.o                   | Bin 4688 -> 4688 bytes
 build/out.out                 | Bin 18224 -> 18224 bytes
 src/root/parser/use_parser.rs |  19 +++++++++
 5 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 741a5b0..02389cb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,12 +9,7 @@
   <component name="ChangeListManager">
     <list default="true" id="6ca282eb-dc8c-4af0-945c-cd77d70c6194" name="Changes" comment="Fmt">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/out.asm" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.asm" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/out.o" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.o" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/out.out" beforeDir="false" afterPath="$PROJECT_DIR$/build/out.out" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/builtin/core/referencing.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/builtin/core/referencing.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/builtin/functions/exit.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/builtin/functions/exit.rs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/root/shared/common.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/shared/common.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/root/parser/use_parser.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/root/parser/use_parser.rs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -68,12 +63,12 @@
       </RecentBranches>
     </option>
   </component>
-  <component name="GithubPullRequestsUISettings">{
-  &quot;selectedUrlAndAccountId&quot;: {
-    &quot;url&quot;: &quot;https://github.com/Robert-M-Lucas/whython-8.git&quot;,
-    &quot;accountId&quot;: &quot;dcb8df19-0b39-47e1-9073-4a54f7034be8&quot;
+  <component name="GithubPullRequestsUISettings"><![CDATA[{
+  "selectedUrlAndAccountId": {
+    "url": "https://github.com/Robert-M-Lucas/whython-8.git",
+    "accountId": "4a322597-eb99-4adb-939a-37a7436c8242"
   }
-}</component>
+}]]></component>
   <component name="MacroExpansionManager">
     <option name="directoryName" value="u41t3cql" />
   </component>
@@ -134,10 +129,6 @@
       <recent name="$PROJECT_DIR$/src/root/builtin/int" />
     </key>
   </component>
-  <component name="RsExternalLinterProjectSettings">
-    <option name="runOnTheFly" value="true" />
-    <option name="tool" value="Clippy" />
-  </component>
   <component name="RunManager" selected="Cargo.Run whython-8">
     <configuration name="Run whython-8" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
       <option name="command" value="run --package whython-8 --bin whython-8" />
@@ -279,6 +270,7 @@
       <workItem from="1722618894942" duration="1095000" />
       <workItem from="1722625341403" duration="1505000" />
       <workItem from="1722969496898" duration="697000" />
+      <workItem from="1723026258349" duration="1557000" />
     </task>
     <task id="LOCAL-00031" summary="Cargo fix">
       <option name="closed" value="true" />
diff --git a/build/out.asm b/build/out.asm
index 19ad520..a0801fe 100644
--- a/build/out.asm
+++ b/build/out.asm
@@ -139,14 +139,14 @@ _11:
     mov qword [rbp-9], rax
     mov rax, qword [rbp-9]
     cmp rax, 0
-    jz __36_24
+    jz __36_16
     mov byte [rbp-1], 0
-    jmp __36_25
-    __36_24:
+    jmp __36_17
+    __36_16:
     mov byte [rbp-1], 1
-    __36_25:
+    __36_17:
     cmp byte [rbp-1], 0
-    jz _11_27
+    jz _11_19
     mov rax, [rbp+16]
     add rax, 0x0000000000000000
     mov qword [rbp-25], rax
@@ -162,8 +162,8 @@ _11:
     mov rdx, qword [rbp-25]
     mov rax, qword [rbp-33]
     mov qword [rdx+0], rax
-    jmp _11_26
-    _11_27:
+    jmp _11_18
+    _11_19:
     mov rax, [rbp+16]
     add rax, 0x0000000000000000
     mov qword [rbp-25], rax
@@ -179,8 +179,8 @@ _11:
     sub rsp, 0x0000000000000049
     call _16
     add rsp, 0x0000000000000049
-    _11_28:
-    _11_26:
+    _11_20:
+    _11_18:
 
 leave
 ret
@@ -226,14 +226,14 @@ _13:
     mov qword [rbp-9], rax
     mov rax, qword [rbp-9]
     cmp rax, 0
-    jz __36_0
+    jz __36_26
     mov byte [rbp-1], 0
-    jmp __36_1
-    __36_0:
+    jmp __36_27
+    __36_26:
     mov byte [rbp-1], 1
-    __36_1:
+    __36_27:
     cmp byte [rbp-1], 0
-    jz _13_2
+    jz _13_28
     mov rax, [rbp+16]
     add rax, 0x0000000000000000
     mov qword [rbp-49], rax
@@ -268,8 +268,8 @@ _13:
     mov qword [rbp+24], rax
     leave
     ret
-    _13_3:
-    _13_2:
+    _13_29:
+    _13_28:
     mov rax, [rbp+16]
     add rax, 0x0000000000000000
     mov qword [rbp-41], rax
@@ -365,14 +365,14 @@ _16:
     mov qword [rbp-9], rax
     mov rax, qword [rbp-9]
     cmp rax, 0
-    jz __36_29
+    jz __36_21
     mov byte [rbp-1], 0
-    jmp __36_30
-    __36_29:
+    jmp __36_22
+    __36_21:
     mov byte [rbp-1], 1
-    __36_30:
+    __36_22:
     cmp byte [rbp-1], 0
-    jz _16_32
+    jz _16_24
     mov rax, [rbp+16]
     add rax, 0x0000000000000008
     mov qword [rbp-25], rax
@@ -388,8 +388,8 @@ _16:
     mov rdx, qword [rbp-25]
     mov rax, qword [rbp-33]
     mov qword [rdx+0], rax
-    jmp _16_31
-    _16_32:
+    jmp _16_23
+    _16_24:
     mov rax, [rbp+16]
     add rax, 0x0000000000000008
     mov qword [rbp-25], rax
@@ -405,8 +405,8 @@ _16:
     sub rsp, 0x0000000000000049
     call _16
     add rsp, 0x0000000000000049
-    _16_33:
-    _16_31:
+    _16_25:
+    _16_23:
 
 leave
 ret
@@ -419,14 +419,14 @@ _17:
     mov qword [rbp-17], 0
     mov rax, qword [rbp-9]
     cmp rax, qword [rbp-17]
-    jz __16_20
+    jz __16_0
     mov byte [rbp-1], 0
-    jmp __16_21
-    __16_20:
+    jmp __16_1
+    __16_0:
     mov byte [rbp-1], 1
-    __16_21:
+    __16_1:
     cmp byte [rbp-1], 0
-    jz _17_22
+    jz _17_2
     mov rax, [rbp+16]
     add rax, 0x0000000000000000
     mov qword [rbp-25], rax
@@ -435,8 +435,8 @@ _17:
     mov qword [rbp+32], rax
     leave
     ret
-    _17_23:
-    _17_22:
+    _17_3:
+    _17_2:
     mov rax, [rbp+16]
     add rax, 0x0000000000000008
     mov qword [rbp-25], rax
@@ -479,14 +479,14 @@ _18:
     mov qword [rbp-9], rax
     mov rax, qword [rbp-9]
     cmp rax, 0
-    jz __36_16
+    jz __36_30
     mov byte [rbp-1], 0
-    jmp __36_17
-    __36_16:
+    jmp __36_31
+    __36_30:
     mov byte [rbp-1], 1
-    __36_17:
+    __36_31:
     cmp byte [rbp-1], 0
-    jz _18_18
+    jz _18_32
     mov rax, [rbp+16]
     add rax, 0x0000000000000008
     mov qword [rbp-49], rax
@@ -521,8 +521,8 @@ _18:
     mov qword [rbp+24], rax
     leave
     ret
-    _18_19:
-    _18_18:
+    _18_33:
+    _18_32:
     mov rax, [rbp+16]
     add rax, 0x0000000000000008
     mov qword [rbp-41], rax
diff --git a/build/out.o b/build/out.o
index ce51e489323b4caa37bd98807dadaaec649bf842..03258740e0763071c2f4d20097444117535c1209 100644
GIT binary patch
delta 457
zcmcbhazSOo0dB^K$p^W`8B-^J1d=%*a<T#shhPc|0}3dgtjHrSSqBzlWSER5+d4TA
zDBA;-U4kY%d2%C<IO9w(Ie+p-pvqNHmGZ18mN2ZF{17O+4Jzx0CcAI4Ag?&%(aDZL
z@(hTaT)@jAcmYk-^~r_2;*$5EX8b^teL8s|Q1@#Px%mQb10!R?<UoFL#>F6Vas$7H
zm!TO$e7vz)yrDTmyrE&dp(U6yGJx<bfRqss8$%QsK@}UBGo%%zrh+8mjX*kpl*QzC
z{7!L(P=z2(X7NTQ5Xuxn0Zjo}1Cjxn52Ap|4b9`h;_)CYK>I+BF$PJ4Xpp=`yfH`t
MkTTjlNnjr%0E<ytu>b%7

delta 494
zcmZ9GEldMJ5QTRVP;GOdHm3+l1+u#b*CIh6Nvi5tQA&a$fWy!_9Abh(kR}9y;inEo
z9ga(oD1yU*Lh@#Jsn|>Iy}kY3y_u?6HSeEm)Z=MQQ=h+~`=a@Ql84mpoIlLun3wB1
zKk?tBIH4o%f}TZsozQb0)iqssz2pZZZ(?$3em1}#ZutZBG1BdXKJj8h)08)$FQWNt
zOjb$qjSoTJBmGV2Cy&waB|51ZL!uq-W}2=<d6=zi*;VCSQ98S(oH5R}gLQ(HFpIYc
zp;j=X_KpSvxpn|h%RkxX>3X0AQl@l;{0EZ+%)rnsXDc=0{?1uRw4Iea#>z4VbG^$p
Y9cR!iCQHR3=6@A*ph32r+%1gh519vGb^rhX

diff --git a/build/out.out b/build/out.out
index 0fa6154d46fe13c279c6c2b41fb75205f6bdf81b..9ce01ed7f7d12de62e07d26c02c4fe39378a1b8b 100755
GIT binary patch
delta 498
zcmdnc$G8EAGMGiG=5@X0PG@)iUd67M71sS*vxnov<{IYhI$~x<1_~NMsVNE`i6sh#
zCVGZ?hPq~&lcf#xIUU2SObQH*%nT+s8ptpM6;56Np*Qb0NMvDrI9btDobl!4Kp^=6
zNa{0wpWJ9FF8PlE1o#*pi#mW=FoJdRMxZPYBZ$w(@C8j)c=AJ_Ig%i9vVfU{<PNYl
zK8AcT2QUjp$WL}O6PHwnnlcYfR)2D#nK+}_<b^=e7DP%O0Bhu9P!M;383CqUCSL@~
zdPB|eK$8uc%xEso7y%-gt};wEGB0B~&aiov`FUnrLo<f>cw@78Lvx0BL&JDOOE6_*
z0O46cB#oeoj6jNv<BdRyfRx4LP1gEhhEO#|KtZ#3BNGT^3ZaaFl0Z?QaUcq))X+R0
fC<Y{f%0c!TgQP$-NX{bO7$ga#j5b@_eB}ZFOfYK@

delta 521
zcmZ9Fze@u#7>1LcgE&+X>v`yK;?knFN$y9kt<aVZEeN853NEptATC-Ead7G4=<@AS
zSEuTME`qCD@jtM1a1cRImrf?lIoRWPpUXXOzOQwOTk<_HCN7%o_vg>T_|9DiSghN7
zM9YQn+;~`k8ZmjLT+Z3a%F0H{rf!<0sm%y;NkFKbT;JcbtF@CzEYcJzZRXr#$~+DY
zGGlN;p{W@@k=hV`g;~$UZ?GowLuLklLBlhx9#T&nbrZ$@*I!_`m3A1ba~ypS*iq=n
zISG|8=1*C>QSWH7_&1=>X(;)oH5b{d0Xq+M-^2{AWoA`chf&iu|IaDHi?r3qRtM}V
zU~b|qm9aAnjGxBpIK1I)Bg<SQgyRe5Awj8NTqDr%wImu;{&a-XPX_n-%yw1_M;53r
o9HyZf@+9kuOx;#g*STQIO31F-OQRK3Ee-^g6BU9mzw|Tm3$nd%n*aa+

diff --git a/src/root/parser/use_parser.rs b/src/root/parser/use_parser.rs
index b0c8e57..0453c9d 100644
--- a/src/root/parser/use_parser.rs
+++ b/src/root/parser/use_parser.rs
@@ -35,6 +35,25 @@ pub fn parse_uses(s: Span) -> ParseResult<Span, Vec<(PathBuf, Location)>> {
             ));
         }
 
+        let mut path_rem = path;
+        while let Ok((rem, c)) = anychar::<_, ErrorTree>(path_rem) {
+            if c.is_alphanumeric() || c == '_' || c == '/' {
+                path_rem = rem;
+                continue;
+            }
+            let mut utf8 = [0u8; 4];
+            c.encode_utf8(&mut utf8);
+            let mut utf8_str = "[".to_string();
+            utf8_str += &utf8.map(|b| format!("{b:02X}")).join(", ");
+            utf8_str.push(']');
+
+
+            return Err(create_custom_error(
+                format!("Invalid character in path '{}' - UTF-8 bytes: {}. Allowed characters are alphanumerics, '_' and '/'", c, utf8_str),
+                path_rem,
+            ));
+        }
+
         let path_buf = PathBuf::from(format!("{}.why", path));
         found_paths.push((path_buf, Location::from_span(&path)));