OSSForks/mariadb-server
1
0
Fork 0
mirror of https://github.com/zebrajr/server.git synced 2025-12-06 00:20:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

MDEV-25312 fixup: Fix .isl file parsing

Browse Source 
read_link_file(): Avoid GCC -Wtype-limits when char is unsigned,
by always using unsigned comparison. Also, avoid buffer overflow
when the .isl file consists entirely of spaces or control codes.
This commit is contained in:
Marko Mäkelä 2021-05-27 13:25:27 +03:00
parent a7d68e7a0f
commit f078788e29
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/innobase/fsp/fsp0file.cc
View File

@ -805,10 +805,12 @@ static char *read_link_file(const char *link_filepath)
{
/* Trim whitespace from end of filepath */
len--;
while (filepath[len] >= 0 && filepath[len] <= 0x20)
while (static_cast<byte>(filepath[len]) <= 0x20)
{
if (!len)
return nullptr;
filepath[len--]= 0;
if (!*filepath)
return nullptr;
}
/* Ensure that the last 2 path separators are forward slashes,
because elsewhere we are assuming that tablespace file names end
in "/databasename/tablename.ibd". */