diff options
author | phk <phk@FreeBSD.org> | 2003-05-02 06:36:14 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2003-05-02 06:36:14 +0000 |
commit | 4c52a206d24421e6c4708baeba60bb6f9b88ebb4 (patch) | |
tree | f30ff1854b1e718bcb5d94f16dcee4c13b5afe1a /sys/geom/geom_mbr.c | |
parent | 6b0e95eef5a40043ddb0bb6618b23b20c6da7ab4 (diff) | |
download | FreeBSD-src-4c52a206d24421e6c4708baeba60bb6f9b88ebb4.zip FreeBSD-src-4c52a206d24421e6c4708baeba60bb6f9b88ebb4.tar.gz |
Use g_slice_spoiled() rather than g_std_spoiled().
Remember to free the buffer we got from g_read_data().
Diffstat (limited to 'sys/geom/geom_mbr.c')
-rw-r--r-- | sys/geom/geom_mbr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c index 362e540..c0232a7 100644 --- a/sys/geom/geom_mbr.c +++ b/sys/geom/geom_mbr.c @@ -300,7 +300,7 @@ g_mbr_taste(struct g_class *mp, struct g_provider *pp, int insist) g_topology_lock(); g_access_rel(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { - g_std_spoiled(cp); + g_slice_spoiled(cp); return (NULL); } return (gp); @@ -398,8 +398,10 @@ g_mbrext_taste(struct g_class *mp, struct g_provider *pp, int insist __unused) buf = g_read_data(cp, off, sectorsize, &error); if (buf == NULL || error != 0) break; - if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) + if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) { + g_free(buf); break; + } for (i = 0; i < NDOSPART; i++) dos_partition_dec( buf + DOSPARTOFF + @@ -440,7 +442,7 @@ g_mbrext_taste(struct g_class *mp, struct g_provider *pp, int insist __unused) g_topology_lock(); g_access_rel(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { - g_std_spoiled(cp); + g_slice_spoiled(cp); return (NULL); } return (gp); |