mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-08 02:40:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ignore trailing slash when sorting zipos entries

Browse source 
before running the binary search in zipos-find.c, the query string is
checked for a trailing slash, which if found is ignored during the
memcmp as part of the search.

however, '/' (ASCII 47) is after '-' (ASCII 45),  so the sorted array
could contain entries like "/zip/x-" followed by "/zip/x/". Now, if the
query string is "/zip/x/", the trailing slash will be removed, but then
"/zip/x-" will be incorrectly matched, leading to an error.

this change adds a similar check to ignore the trailing slash during the
construction of the sorted array to ensure "/zip/x-" occurs after
"/zip/x/", and avoid such errors.
This commit is contained in:
Gautham 2023-09-13 08:19:10 +00:00
parent 81f391dd22
commit b36a119a85
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libc/runtime/zipos-get.c
View file

@ -77,10 +77,13 @@ static int __zipos_compare_names(const void *a, const void *b, void *c) {
struct Zipos *z = (struct Zipos *)c; struct Zipos *z = (struct Zipos *)c;
int xn = ZIP_CFILE_NAMESIZE(z->map + *x); int xn = ZIP_CFILE_NAMESIZE(z->map + *x);
int yn = ZIP_CFILE_NAMESIZE(z->map + *y); int yn = ZIP_CFILE_NAMESIZE(z->map + *y);
const char *xp = ZIP_CFILE_NAME(z->map + *x);
const char *yp = ZIP_CFILE_NAME(z->map + *y);
if (xn && xp[xn-1] == '/') --xn;
if (yn && yp[yn-1] == '/') --yn;
int n = MIN(xn, yn); int n = MIN(xn, yn);
if (n) { if (n) {
int res = int res = memcmp(xp, yp, n);
memcmp(ZIP_CFILE_NAME(z->map + *x), ZIP_CFILE_NAME(z->map + *y), n);
if (res) return res; if (res) return res;
} }
return xn - yn; // xn and yn are 16-bit return xn - yn; // xn and yn are 16-bit