d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we free the GPT partition list in bd_open_gpt() because of an error, don't

Browse Source 
try to free it again in bd_closedisk(). While I'm here, fix a DEBUG print.
This commit is contained in:
dfr 2008-11-19 16:04:07 +00:00
parent d8ed8b66e6
commit a24417724c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/boot/i386/libi386/biosdisk.c
View File

@ -969,8 +969,10 @@ bd_open_gpt(struct open_disk *od, struct i386_devdesc *dev)
od->od_boff = gp->gp_start;
out:
if (error)
if (error) {
free(od->od_partitions);
od->od_flags &= ~BD_GPTOK;
}
return (error);
}
@ -1058,7 +1060,7 @@ bd_realstrategy(void *devdata, int rw, daddr_t dblk, size_t size, char *buf, siz
switch(rw){
case F_READ:
DEBUG("read %d from %d to %p", blks, dblk, buf);
DEBUG("read %d from %lld to %p", blks, dblk, buf);
if (blks && bd_read(od, dblk, blks, buf)) {
DEBUG("read error");