remove infinite loop

2 files changed, 6 insertions, 2 deletions

diff --git a/iri.c b/iri.c
index 8c02039..1901dac 100644
--- a/iri.c
+++ b/iri.c
@@ -209,8 +209,8 @@ path_clean(char *path)
 
 	/* 2. eliminate each . path name element */
 	for (i = path; *i; ++i) {
-		if ((i == path || *i == '/') && *(i+1) == '.' &&
-		    *(i+2) == '/') {
+		if ((i == path || *i == '/') &&
+		    *i != '.' && i[1] == '.' && i[2] == '/') {
 			/* move also the \0 */
 			memmove(i, i+2, strlen(i)-1);
 			i--;
diff --git a/iri_test.c b/iri_test.c
index 6200cb7..18a1020 100644
--- a/iri_test.c
+++ b/iri_test.c
@@ -153,6 +153,10 @@ main(void)
 	    FAIL,
             empty,
 	    "reject paths that would escape the root");
+	TEST("gemini://omarpolo.com/foo/../../",
+	    FAIL,
+            empty,
+	    "reject paths that would escape the root")
 	TEST("gemini://omarpolo.com/foo/../foo/../././/bar/baz/.././.././/",
 	    PASS,
             IRI("gemini", "omarpolo.com", "", "", "", ""),