From 6d4847934fc0fe47a3254ce6c0396d197a780cf4 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 29 May 2022 06:19:30 -0500 Subject: [PATCH] Don't segfault if xabspath() returns null (spotted by Taolaw). --- toys/net/httpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toys/net/httpd.c b/toys/net/httpd.c index 9e91197a..ad8bc4e4 100644 --- a/toys/net/httpd.c +++ b/toys/net/httpd.c @@ -83,7 +83,7 @@ char *mime(char *file) static int isunder(char *file, char *dir) { char *s1 = xabspath(dir, ABS_FILE), *s2 = xabspath(file, 0), *ss = s2; - int rc = strstart(&ss, s2) && (!*ss || *ss=='/' || ss[-1]=='/'); + int rc = s1 && s2 && strstart(&ss, s1) && (!*ss || *ss=='/' || ss[-1]=='/'); free(s2); free(s1); -- 2.39.2