evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix windows pread and pwrite bug

Browse Source 
reading without a byte offset specified can affect absolute reads afterward, this is a workaround (thanks windows...)
This commit is contained in:
Kae 2024-09-12 23:06:13 +10:00
parent 7852ad9cf2
commit 9df51b51b8
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/core/StarFile_windows.cpp
View File

@ -18,14 +18,12 @@
namespace Star { namespace Star {
namespace {
OVERLAPPED makeOverlapped(StreamOffset offset) { OVERLAPPED makeOverlapped(StreamOffset offset) {
OVERLAPPED overlapped = {}; OVERLAPPED overlapped = {};
overlapped.Offset = offset; overlapped.Offset = offset;
overlapped.OffsetHigh = offset >> 32; overlapped.OffsetHigh = offset >> 32;
return overlapped; return overlapped;
} }
}
String File::convertDirSeparators(String const& path) { String File::convertDirSeparators(String const& path) {
return path.replace("/", "\\"); return path.replace("/", "\\");
@ -378,6 +376,7 @@ size_t File::pread(void* f, char* data, size_t len, StreamOffset position) {
DWORD numRead = 0; DWORD numRead = 0;
OVERLAPPED overlapped = makeOverlapped(position); OVERLAPPED overlapped = makeOverlapped(position);
int ret = ReadFile(file, data, len, &numRead, &overlapped); int ret = ReadFile(file, data, len, &numRead, &overlapped);
fseek(f, -(StreamOffset)numRead, IOSeek::Relative);
if (ret == 0) { if (ret == 0) {
auto err = GetLastError(); auto err = GetLastError();
if (err != ERROR_IO_PENDING) if (err != ERROR_IO_PENDING)
@ -392,6 +391,7 @@ size_t File::pwrite(void* f, char const* data, size_t len, StreamOffset position
DWORD numWritten = 0; DWORD numWritten = 0;
OVERLAPPED overlapped = makeOverlapped(position); OVERLAPPED overlapped = makeOverlapped(position);
int ret = WriteFile(file, data, len, &numWritten, &overlapped); int ret = WriteFile(file, data, len, &numWritten, &overlapped);
fseek(f, -(StreamOffset)numWritten, IOSeek::Relative);
if (ret == 0) { if (ret == 0) {
auto err = GetLastError(); auto err = GetLastError();
if (err != ERROR_IO_PENDING) if (err != ERROR_IO_PENDING)

7
source/core/StarImage.cpp
View File

@ -18,13 +18,12 @@ void readPngData(png_structp pngPtr, png_bytep data, png_size_t length) {
}; };
bool Image::isPng(IODevicePtr device) { bool Image::isPng(IODevicePtr device) {
png_byte header[8]; png_byte header[8]{};
device->readAbsolute(0, (char*)header, sizeof(header)); return !png_sig_cmp(header, 0, device->readAbsolute(0, (char*)header, sizeof(header)));
return !png_sig_cmp(header, 0, sizeof(header));
} }
Image Image::readPng(IODevicePtr device) { Image Image::readPng(IODevicePtr device) {
png_byte header[8]; png_byte header[8]{};
device->readFull((char*)header, sizeof(header)); device->readFull((char*)header, sizeof(header));
if (png_sig_cmp(header, 0, sizeof(header))) if (png_sig_cmp(header, 0, sizeof(header)))