svn commit: r194007 - in stable/6/sys: . boot/i386/libi386 contrib/pf dev/cxgb

[John Baldwin]

Author: jhb
Date: Thu Jun 11 15:16:07 2009
New Revision: 194007
URL: http://svn.freebsd.org/changeset/base/194007

Log:
  MFC: Don't attempt to free the GPT partition list for a disk with an empty
  GPT.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/boot/i386/libi386/biosdisk.c
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- stable/6/sys/boot/i386/libi386/biosdisk.c	Thu Jun 11 15:15:40 2009	(r194006)
+++ stable/6/sys/boot/i386/libi386/biosdisk.c	Thu Jun 11 15:16:07 2009	(r194007)
@@ -995,7 +995,8 @@ bd_open_gpt(struct open_disk *od, struct
 
 out:
     if (error)
-	free(od->od_partitions);
+	if (od->od_nparts > 0)
+	    free(od->od_partitions);
     return (error);
 }
 
@@ -1046,7 +1047,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);