mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-14132 follow-up fix: Validate the posix_fallocate() argument

Browse source 
os_file_set_size(): Sometimes the file already is large enough.
Avoid calling posix_fallocate() with a non-positive argument.
Also, add a missing space to an error message.
This commit is contained in:
Marko Mäkelä 2017-10-27 18:59:22 +03:00
parent 057a6cf768
commit 5f5ffdc76b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/os/os0file.cc
View file

@ -5382,14 +5382,16 @@ fallback:
int err; int err;
do { do {
os_offset_t current_size = os_file_get_size(file); os_offset_t current_size = os_file_get_size(file);
err = posix_fallocate(file, current_size, size - current_size); err = current_size >= size
? 0 : posix_fallocate(file, current_size,
size - current_size);
} while (err == EINTR } while (err == EINTR
&& srv_shutdown_state == SRV_SHUTDOWN_NONE); && srv_shutdown_state == SRV_SHUTDOWN_NONE);
if (err) { if (err) {
ib::error() << ib::error() <<
"preallocating " << size << " bytes for" << "preallocating " << size << " bytes for" <<
"file " << name << "failed with error " << err; "file " << name << " failed with error " << err;
} }
errno = err; errno = err;
return(!err); return(!err);