Skip to content

Draft: fix: layer_read #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Draft: fix: layer_read #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion libqcow/libqcow_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2692,10 +2692,15 @@ ssize_t libqcow_internal_file_read_buffer_from_file_io_handle(
}
else if( internal_file->parent_file != NULL )
{
// Don't read past the end of the cluster block to avoid reading into cow written clusters present in the current layer
size_t cluster_end = internal_file->current_offset / internal_file->cluster_block_size * internal_file->cluster_block_size +
internal_file->cluster_block_size;
size_t to_read = cluster_end - internal_file->current_offset < buffer_size - buffer_offset ?
cluster_end - internal_file->current_offset : buffer_size - buffer_offset;
read_count = libqcow_file_read_buffer_at_offset(
internal_file->parent_file,
&( ( (uint8_t *) buffer )[ buffer_offset ] ),
buffer_size - buffer_offset,
to_read,
internal_file->current_offset,
error );

Expand Down