Module Name: src
Committed By: jnemeth
Date: Thu Nov 28 01:37:14 UTC 2013
Modified Files:
src/sbin/gpt: add.c label.c remove.c resize.c
Log Message:
when calling dehumanize_number() make sure the resulting number is >= 1
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/gpt/add.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/gpt/label.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/gpt/remove.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/gpt/resize.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/add.c
diff -u src/sbin/gpt/add.c:1.20 src/sbin/gpt/add.c:1.21
--- src/sbin/gpt/add.c:1.20 Wed Nov 27 01:47:53 2013
+++ src/sbin/gpt/add.c Thu Nov 28 01:37:14 2013
@@ -29,7 +29,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.20 2013/11/27 01:47:53 jnemeth Exp $");
+__RCSID("$NetBSD: add.c,v 1.21 2013/11/28 01:37:14 jnemeth Exp $");
#endif
#include <sys/types.h>
@@ -203,6 +203,8 @@ cmd_add(int argc, char *argv[])
if (dehumanize_number(optarg, &human_num) < 0)
usage_add();
alignment = human_num;
+ if (alignment < 1)
+ usage_add();
break;
case 'b':
if (block > 0)
@@ -210,6 +212,8 @@ cmd_add(int argc, char *argv[])
if (dehumanize_number(optarg, &human_num) < 0)
usage_add();
block = human_num;
+ if (block < 1)
+ usage_add();
break;
case 'i':
if (entry > 0)
Index: src/sbin/gpt/label.c
diff -u src/sbin/gpt/label.c:1.13 src/sbin/gpt/label.c:1.14
--- src/sbin/gpt/label.c:1.13 Wed Nov 27 01:47:53 2013
+++ src/sbin/gpt/label.c Thu Nov 28 01:37:14 2013
@@ -29,7 +29,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: label.c,v 1.13 2013/11/27 01:47:53 jnemeth Exp $");
+__RCSID("$NetBSD: label.c,v 1.14 2013/11/28 01:37:14 jnemeth Exp $");
#endif
#include <sys/types.h>
@@ -197,6 +197,8 @@ cmd_label(int argc, char *argv[])
if (dehumanize_number(optarg, &human_num) < 0)
usage_label();
block = human_num;
+ if (block < 1)
+ usage_label();
break;
case 'f':
if (name != NULL)
Index: src/sbin/gpt/remove.c
diff -u src/sbin/gpt/remove.c:1.11 src/sbin/gpt/remove.c:1.12
--- src/sbin/gpt/remove.c:1.11 Wed Nov 27 01:47:53 2013
+++ src/sbin/gpt/remove.c Thu Nov 28 01:37:14 2013
@@ -29,7 +29,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: remove.c,v 1.11 2013/11/27 01:47:53 jnemeth Exp $");
+__RCSID("$NetBSD: remove.c,v 1.12 2013/11/28 01:37:14 jnemeth Exp $");
#endif
#include <sys/types.h>
@@ -169,6 +169,8 @@ cmd_remove(int argc, char *argv[])
if (dehumanize_number(optarg, &human_num) < 0)
usage_remove();
block = human_num;
+ if (block < 1)
+ usage_remove();
break;
case 'i':
if (entry > 0)
Index: src/sbin/gpt/resize.c
diff -u src/sbin/gpt/resize.c:1.4 src/sbin/gpt/resize.c:1.5
--- src/sbin/gpt/resize.c:1.4 Wed Nov 27 20:34:34 2013
+++ src/sbin/gpt/resize.c Thu Nov 28 01:37:14 2013
@@ -29,7 +29,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: resize.c,v 1.4 2013/11/27 20:34:34 christos Exp $");
+__RCSID("$NetBSD: resize.c,v 1.5 2013/11/28 01:37:14 jnemeth Exp $");
#endif
#include <sys/types.h>
@@ -188,6 +188,8 @@ cmd_resize(int argc, char *argv[])
if (dehumanize_number(optarg, &human_num) < 0)
usage_resize();
alignment = human_num;
+ if (alignment < 1)
+ usage_resize();
break;
case 'i':
if (entry > 0)
