diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2009-06-08 15:07:35 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2009-06-08 15:07:35 +0000 |
| commit | 2a4eff4703c548402ea6d5444ef8878d15cada46 (patch) | |
| tree | d2127e081681ab3081f091cb38f4470697a1a41c /sys/boot | |
| parent | ce2b1ae5c4ebb38f64c4ef293507c867981c00f3 (diff) | |
| download | src-2a4eff4703c548402ea6d5444ef8878d15cada46.tar.gz src-2a4eff4703c548402ea6d5444ef8878d15cada46.zip | |
Don't attempt to free the GPT partition list for a disk with an empty GPT.
Submitted by: Yuri Pankov yuri.pankov of gmail
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=193719
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/libi386/biosdisk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c index 84b58d6c555c..b49d4e6ec855 100644 --- a/sys/boot/i386/libi386/biosdisk.c +++ b/sys/boot/i386/libi386/biosdisk.c @@ -990,7 +990,8 @@ bd_open_gpt(struct open_disk *od, struct i386_devdesc *dev) out: if (error) { - free(od->od_partitions); + if (od->od_nparts > 0) + free(od->od_partitions); od->od_flags &= ~BD_GPTOK; } return (error); @@ -1044,7 +1045,7 @@ bd_closedisk(struct open_disk *od) delay(3000000); #endif #ifdef LOADER_GPT_SUPPORT - if (od->od_flags & BD_GPTOK) + if (od->od_flags & BD_GPTOK && od->od_nparts > 0) free(od->od_partitions); #endif free(od); |