vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

archelp: Fix handling of dot and dotdot at the end of the name.

Browse source 
Fixes cpio_test and tar_test.
This commit is contained in:
Vladimir Serbinenko 2015-07-23 19:01:00 +02:00
parent ca73ae446c
commit f34a422081
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub-core/fs/archelp.c
View file

@ -34,12 +34,12 @@ canonicalize (char *name)
iptr++; iptr++;
if (iptr[0] == '.' && (iptr[1] == '/' || iptr[1] == 0)) if (iptr[0] == '.' && (iptr[1] == '/' || iptr[1] == 0))
{ {
iptr += 2; iptr++;
continue; continue;
} }
if (iptr[0] == '.' && iptr[1] == '.' && (iptr[2] == '/' || iptr[2] == 0)) if (iptr[0] == '.' && iptr[1] == '.' && (iptr[2] == '/' || iptr[2] == 0))
{ {
iptr += 3; iptr += 2;
if (optr == name) if (optr == name)
continue; continue;
for (optr -= 2; optr >= name && *optr != '/'; optr--); for (optr -= 2; optr >= name && *optr != '/'; optr--);