archive/iso9660: check "skip==0" before doing optimized large read

After a Seek() to an odd offset, some data needs to be skipped from the start of the block, and reading right into the given buffer doesn't work.

archive/iso9660: check "skip==0" before doing optimized large read
4be76f3c · Max Kellermann · c58c5329 · 4be76f3c
Commit 4be76f3c authored Feb 07, 2021 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Iso9660ArchivePlugin.cxx src/archive/plugins/Iso9660ArchivePlugin.cxx +1 -1

No files found.
--- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
@@ -266,7 +266,7 @@ Iso9660InputStream::Read(std::unique_lock<Mutex> &,

 		const lsn_t read_lsn = lsn + offset / ISO_BLOCKSIZE;

-		if (read_size >= ISO_BLOCKSIZE) {
+		if (read_size >= ISO_BLOCKSIZE && skip == 0) {
 			/* big read - read right into the caller's buffer */

 			auto nbytes = iso->SeekRead(ptr, read_lsn,