Skip to content

Commit

Permalink
Linux/OSX: Fix reversed fsync check
Browse files Browse the repository at this point in the history
This if() condition checks the result of seek, write, flush
and fsync. The first three are methods on QFile, so return
a truthy value on success. write() returns number of bytes
written while seek() and flush() return bool true on success.
Therefore they have to be inverted to detect errors. However,
fsync() is a posix system call, so it returns zero (false) on
success. Therefore it should not be inverted.

Note that currently this entire code block can never run.
knownsize is always zero because QFile.size() currently
cannot determine the size of a block device. However, when I
asked to confirm this behavior, a Qt maintainer decided to
implement it, so there is now a PR. If that is released then
this code block will become live and the reversed fsync check
will cause a problem.

PR: https://codereview.qt-project.org/c/qt/qtbase/+/581443
  • Loading branch information
ali1234 authored and tdewey-rpi committed Aug 7, 2024
1 parent c1c8c5a commit 7725ce7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/downloadthread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ bool DownloadThread::_openAndPrepareDevice()
if (!_file.seek(knownsize-emptyMB.size())
|| !_file.write(emptyMB.data(), emptyMB.size())
|| !_file.flush()
|| !::fsync(_file.handle()))
|| ::fsync(_file.handle()))
{
emit error(tr("Write error while trying to zero out last part of card.<br>"
"Card could be advertising wrong capacity (possible counterfeit)."));
Expand Down

0 comments on commit 7725ce7

Please sign in to comment.