diff options
| author | brian <brian@FreeBSD.org> | 2004-06-04 11:49:11 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2004-06-04 11:49:11 +0000 |
| commit | 1a106ea8b690010d54c842e06a1005b48c2b6443 (patch) | |
| tree | 16383712c75aacfef9aa8bb791001bdadb145f64 /lib/libdisk/write_pc98_disk.c | |
| parent | 284de6b08c1bf421b8b558965caebde2da7816a4 (diff) | |
| download | FreeBSD-src-1a106ea8b690010d54c842e06a1005b48c2b6443.zip FreeBSD-src-1a106ea8b690010d54c842e06a1005b48c2b6443.tar.gz | |
Handle read_block() failures by ignoring the disk rather than
dumping core.
Diffstat (limited to 'lib/libdisk/write_pc98_disk.c')
| -rw-r--r-- | lib/libdisk/write_pc98_disk.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/libdisk/write_pc98_disk.c b/lib/libdisk/write_pc98_disk.c index 0602596..8f2a45d 100644 --- a/lib/libdisk/write_pc98_disk.c +++ b/lib/libdisk/write_pc98_disk.c @@ -37,7 +37,8 @@ Write_FreeBSD(int fd, const struct disk *new, const struct chunk *c1) u_char buf[BBSIZE]; for (i = 0; i < BBSIZE / 512; i++) { - p = read_block(fd, i + c1->offset, 512); + if (!(p = read_block(fd, i + c1->offset, 512))) + return (1); memcpy(buf + 512 * i, p, 512); free(p); } @@ -87,7 +88,10 @@ Write_Disk(const struct disk *d1) } memset(s, 0, sizeof s); - mbrblk = read_block(fd, 1, d1->sector_size); + if (!(mbrblk = read_block(fd, 1, d1->sector_size))) { + close (fd); + return (1); + } dp = (struct pc98_partition *)(mbrblk + DOSPARTOFF); memcpy(work, dp, sizeof work); dp = work; @@ -151,7 +155,10 @@ Write_Disk(const struct disk *d1) if (d1->bootipl) write_block(fd, 0, d1->bootipl, d1->sector_size); - mbrblk = read_block(fd, 1, d1->sector_size); + if (!(mbrblk = read_block(fd, 1, d1->sector_size))) { + close (fd); + return (1); + } memcpy(mbrblk + DOSPARTOFF, dp, sizeof *dp * NDOSPART); /* XXX - for entire FreeBSD(98) */ for (c1 = d1->chunks->part; c1; c1 = c1->next) |
