Fix out-of-bounds memory accesses with virtual_root=""

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index cc06930f68acad64c430ae1fea7c8bdd9c13ae60..1fa9c99d5d8cc699e537d39bb1d38428383b941b 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -115,6 +115,21 @@ char *trim_end(const char *str, char c)
        return xstrndup(str, len);
 }
 
+char *ensure_end(const char *str, char c)
+{
+       size_t len = strlen(str);
+       char *result;
+
+       if (len && str[len - 1] == c)
+               return xstrndup(str, len);
+
+       result = xmalloc(len + 2);
+       memcpy(result, str, len);
+       result[len] = '/';
+       result[len + 1] = '\0';
+       return result;
+}
+
 char *strlpart(char *txt, int maxlen)
 {
        char *result;