Wed Dec 2 10:19:58 2015 UTC ()

- dereferencing NULL is generally bad, found by visual inspection
- automatically set nosync when opening a file to avoid spurious errors


(jnemeth)

diff -r1.54 -r1.55 src/sbin/gpt/gpt.c

--- src/sbin/gpt/gpt.c 2015/12/02 04:17:25	1.54
+++ src/sbin/gpt/gpt.c 2015/12/02 10:19:58	1.55

 @@ -25,27 +25,27 @@
+ *
  * CRC32 code derived from work by Gary S. Brown.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.54 2015/12/02 04:17:25 christos Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.55 2015/12/02 10:19:58 jnemeth Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/bootblock.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <stddef.h>
 @@ -457,27 +457,27 @@ gpt_gpt(gpt_t gpt, off_t lba, int found)
 	free(hdr);
 	return (0);
+}
 gpt_t
 gpt_open(const char *dev, int flags, int verbose, off_t mediasz, u_int secsz)
+{
 	int mode, found;
 	off_t devsz;
 	gpt_t gpt;
 	if ((gpt = calloc(1, sizeof(*gpt))) == NULL) {
-		if (!(gpt->flags & GPT_QUIET))
+		if (!(flags & GPT_QUIET))
 			warn("Cannot allocate `%s'", dev);
 		return NULL;
+	}
 	gpt->flags = flags;
 	gpt->verbose = verbose;
 	gpt->mediasz = mediasz;
 	gpt->secsz = secsz;
 	mode = (gpt->flags & GPT_READONLY) ? O_RDONLY : O_RDWR|O_EXCL;
 	gpt->fd = opendisk(dev, mode, gpt->device_name,
 	    sizeof(gpt->device_name), 0);
 	if (gpt->fd == -1) {
 @@ -515,26 +515,27 @@ gpt_open(const char *dev, int flags, int
 				gpt_warnx(gpt, "Media size can't be 0");
 				goto close;
+			}
+		}
 	} else {
 		if (gpt->secsz == 0)
 			gpt->secsz = 512;	/* Fixed size for files. */
 		if (gpt->mediasz == 0) {
 			if (gpt->sb.st_size % gpt->secsz) {
 				errno = EINVAL;
 				goto close;
+			}
 			gpt->mediasz = gpt->sb.st_size;
 			gpt->flags |= GPT_NOSYNC;
+		}
+	}
 	/*
 	 * We require an absolute minimum of 6 sectors. One for the MBR,
 	 * 2 for the GPT header, 2 for the GPT table and one to hold some
 	 * user data. Let's catch this extreme border case here so that
 	 * we don't have to worry about it later.
 	 */
 	devsz = gpt->mediasz / gpt->secsz;
 	if (devsz < 6) {
 		gpt_warnx(gpt, "Need 6 sectorso, we have %ju",
 		    (uintmax_t)devsz);