From cd02a24b6112da50816a8021d97a2b26038f7190 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 7 May 2010 16:55:33 +0200 Subject: dmg: fix reading of uncompressed chunks 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 file changed, 2 insertions(+), 1 deletion(-) (limited to 'block/dmg.c') diff --git a/block/dmg.c b/block/dmg.c index d5c1a687e4..02a3d67206 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; -- cgit v1.2.1