firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fixed bug #6968 : On Windows, engine may hung when works with corrupted database and read after the end of file

Browse Source
This commit is contained in:
Vlad Khorsun 2021-09-14 23:47:46 +03:00
parent 9022535f95
commit 2f6291aaa7
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/jrd/os/win32/winnt.cpp
View File

@ -290,10 +290,10 @@ void PIO_extend(thread_db* tdbb, jrd_file* main_file, const ULONG extPages, cons
const DWORD ret = SetFilePointer(hFile, newSize.LowPart, &newSize.HighPart, FILE_BEGIN);
if (ret == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) {
nt_error("SetFilePointer", file, isc_io_write_err, 0);
nt_error("SetFilePointer", file, isc_io_write_err, NULL);
}
if (!SetEndOfFile(hFile)) {
nt_error("SetEndOfFile", file, isc_io_write_err, 0);
nt_error("SetEndOfFile", file, isc_io_write_err, NULL);
}
leftPages -= extendBy;
@ -405,13 +405,16 @@ void PIO_header(thread_db* tdbb, UCHAR* address, int length)
memset(&overlapped, 0, sizeof(OVERLAPPED));
overlapped.hEvent = ThreadSync::getThread(FB_FUNCTION)->getIOEvent();
DWORD actual_length;
DWORD ret = ReadFile(desc, address, length, NULL, &overlapped);
if (!GetOverlappedResult(desc, &overlapped, &actual_length, TRUE) ||
actual_length != (DWORD) length)
DWORD actual_length;
BOOL ret = ReadFile(desc, address, length, &actual_length, &overlapped);
if (!ret)
{
nt_error("ReadFile", file, isc_io_read_err, 0);
if (GetLastError() == ERROR_IO_PENDING)
ret = GetOverlappedResult(desc, &overlapped, &actual_length, TRUE);
}
if (!ret || (length != actual_length))
nt_error("ReadFile", file, isc_io_read_err, NULL);
}
// we need a class here only to return memory on shutdown and avoid
@ -471,9 +474,14 @@ USHORT PIO_init_data(thread_db* tdbb, jrd_file* main_file, FbStatusVector* statu
const DWORD to_write = (DWORD) write_pages * dbb->dbb_page_size;
DWORD written;
DWORD ret = WriteFile(file->fil_desc, zero_buff, to_write, NULL, &overlapped);
if (!GetOverlappedResult(file->fil_desc, &overlapped, &written, TRUE) ||
to_write != written)
BOOL ret = WriteFile(file->fil_desc, zero_buff, to_write, &written, &overlapped);
if (!ret)
{
if (GetLastError() == ERROR_IO_PENDING)
ret = GetOverlappedResult(file->fil_desc, &overlapped, &written, TRUE);
}
if (!ret || (to_write != written))
{
nt_error("WriteFile", file, isc_io_write_err, status_vector);
break;
@ -580,13 +588,16 @@ bool PIO_read(thread_db* tdbb, jrd_file* file, BufferDesc* bdb, Ods::pag* page,
HANDLE desc = file->fil_desc;
DWORD actual_length;
DWORD ret = ReadFile(desc, page, size, NULL, &overlapped);
if (!GetOverlappedResult(desc, &overlapped, &actual_length, TRUE) ||
actual_length != size)
BOOL ret = ReadFile(desc, page, size, &actual_length, &overlapped);
if (!ret)
{
return nt_error("ReadFile", file, isc_io_read_err, status_vector);
if (GetLastError() == ERROR_IO_PENDING)
ret = GetOverlappedResult(desc, &overlapped, &actual_length, TRUE);
}
if (!ret || (size != actual_length))
return nt_error("ReadFile", file, isc_io_read_err, status_vector);
return true;
}
@ -755,12 +766,16 @@ bool PIO_write(thread_db* tdbb, jrd_file* file, BufferDesc* bdb, Ods::pag* page,
HANDLE desc = file->fil_desc;
DWORD actual_length;
DWORD ret = WriteFile(desc, page, size, NULL, &overlapped);
if (!GetOverlappedResult(desc, &overlapped, &actual_length, TRUE) || actual_length != size )
BOOL ret = WriteFile(desc, page, size, &actual_length, &overlapped);
if (!ret)
{
return nt_error("WriteFile", file, isc_io_write_err, status_vector);
if (GetLastError() == ERROR_IO_PENDING)
ret = GetOverlappedResult(desc, &overlapped, &actual_length, TRUE);
}
if (!ret || (size != actual_length))
return nt_error("WriteFile", file, isc_io_write_err, status_vector);
return true;
}