mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-21 04:13:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix reading a file as a bitmap when not at the start of the file

Browse Source 
library/io.m:
    read_binary_file_as_bitmap/4 checks the size of the entire file when
    sizing the bitmap and reading, but this does not account for if the
    file had already been read from.
    This only occured on Unix, as the file size check does not exist on
    Windows.
This commit is contained in:
AaskanEmily
2019-09-16 22:37:53 -07:00
committed by Julien Fischer
parent 885f4b72ac
commit 3e3dbab0e0
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/io.m
View File

@@ -3601,13 +3601,15 @@ read_binary_file_as_bitmap(Stream, Result, !IO) :-
% size of 4k minus a bit (to give malloc some room).
binary_input_stream_file_size(Stream, FileSize, !IO),
( if FileSize >= 0 then
binary_input_stream_offset(Stream, CurrentOffset, !IO),
RemainingSize = FileSize - CurrentOffset,
some [!BM] (
!:BM = bitmap.init(FileSize * bits_per_byte),
read_bitmap(Stream, 0, FileSize,
!:BM = bitmap.init(RemainingSize * bits_per_byte),
read_bitmap(Stream, 0, RemainingSize,
!BM, BytesRead, ReadResult, !IO),
(
ReadResult = ok,
( if BytesRead = FileSize then
( if BytesRead = RemainingSize then
Result = ok(!.BM)
else
Result = error(io_error(