mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed 'concat' mode lseek() for whence != SEEK_SET.

Browse Source
This commit is contained in:
Volker Ruppert 2015-10-17 14:08:23 +00:00
parent 141aea5f1b
commit 2420ba499e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/iodev/hdimage/hdimage.cc
View File

@ -629,10 +629,10 @@ Bit64s concat_image_t::lseek(Bit64s offset, int whence)
return -1;
}
// is this offset in this disk image?
if (offset < (Bit64s)curr_min) {
if (total_offset < curr_min) {
// no, look at previous images
for (int i=index-1; i>=0; i--) {
if (offset >= (Bit64s)start_offset_table[i]) {
if (total_offset >= start_offset_table[i]) {
index = i;
curr_fd = fd_table[i];
curr_min = start_offset_table[i];
@ -641,10 +641,10 @@ Bit64s concat_image_t::lseek(Bit64s offset, int whence)
break;
}
}
} else if (offset > (Bit64s)curr_max) {
} else if (total_offset > curr_max) {
// no, look at later images
for (int i=index+1; i<maxfd; i++) {
if (offset < (Bit64s)(start_offset_table[i] + length_table[i])) {
if (total_offset < (start_offset_table[i] + length_table[i])) {
index = i;
curr_fd = fd_table[i];
curr_min = start_offset_table[i];
@ -655,7 +655,7 @@ Bit64s concat_image_t::lseek(Bit64s offset, int whence)
}
}
// now offset should be within the current image.
offset -= start_offset_table[index];
offset = total_offset - start_offset_table[index];
if ((offset < 0) || (offset >= (Bit64s)length_table[index])) {
BX_PANIC(("concat_image_t.lseek to byte %ld failed", (long)offset));
return -1;