From patchwork Fri May 14 17:10:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [15/21] dmg: fix reading of uncompressed chunks Date: Fri, 14 May 2010 07:10:49 -0000 From: Kevin Wolf X-Patchwork-Id: 52644 Message-Id: <1273857055-26715-16-git-send-email-kwolf@redhat.com> To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Christoph Hellwig When dmg_read_chunk encounters an uncompressed chunk it currently calls read without any previous adjustment of the file postion. This seems very wrong, and the "reference" implementation in dmg2img does a search to the same offset as done in the various compression cases, so do the same here. Signed-off-by: Christoph Hellwig Signed-off-by: Kevin Wolf --- block/dmg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index d5c1a68..02a3d67 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -239,7 +239,8 @@ static inline int dmg_read_chunk(BDRVDMGState *s,int sector_num) return -1; break; } case 1: /* copy */ - ret = read(s->fd, s->uncompressed_chunk, s->lengths[chunk]); + ret = pread(s->fd, s->uncompressed_chunk, s->lengths[chunk], + s->offsets[chunk]); if (ret != s->lengths[chunk]) return -1; break;