Pi-Hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2025-12-24 21:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2661 from pi-hole/fix/pihole_format_path

Browse Source 
Fix pihole.format_path(string) modifying string in-place
This commit is contained in:
Dominik
2025-10-26 08:03:11 +01:00
committed by GitHub
parent d4af4f7c4e 86a1c414c2
commit a16dd6c7f8
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/lua/ftl_lua.c
View File

@@ -269,25 +269,41 @@ static int pihole_format_path(lua_State *L) {
// Get current page (first argument to LUA function) // Get current page (first argument to LUA function)
const char *page = luaL_checkstring(L, 1); const char *page = luaL_checkstring(L, 1);
// Strip leading webhome from page (if it exists) // Duplicate string to modify it
char *page_copy = strdup(page);
if (page_copy == NULL)
{
// Memory allocation error
lua_pushnil(L);
return 1; // number of results
}
// Strip leading webhome from page_copy (if it exists)
if (config.webserver.paths.webhome.v.s != NULL) if (config.webserver.paths.webhome.v.s != NULL)
{ {
const size_t webhome_len = strlen(config.webserver.paths.webhome.v.s); const size_t webhome_len = strlen(config.webserver.paths.webhome.v.s);
if (strncmp(page, config.webserver.paths.webhome.v.s, webhome_len) == 0) if (strncmp(page_copy, config.webserver.paths.webhome.v.s, webhome_len) == 0)
page += webhome_len; page_copy += webhome_len;
} }
// Convert all / to - // Convert all / to -
for (char *p = (char *)page; *p != '\0'; p++) for (char *p = (char *)page_copy; *p != '\0'; p++)
if (*p == '/') if (*p == '/')
*p = '-'; *p = '-';
if (page_copy[0] == '\0')
{
// Substitute "index" for empty string (dashboard landing page) // Substitute "index" for empty string (dashboard landing page)
if (page[0] == '\0') lua_pushstring(L, "index");
page = "index"; }
else
{
// Return the formatted page string // Return the formatted page string
lua_pushstring(L, page); lua_pushstring(L, page_copy);
}
// Free allocated memory
free(page_copy);
return 1; // number of results return 1; // number of results
} }